Magellan Linux

Diff of /branches/mage-next/src/smage2.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1630 by niro, Fri Jan 13 13:17:21 2012 UTC revision 1633 by niro, Fri Jan 13 13:22:33 2012 UTC
# Line 242  mconfigure() Line 242  mconfigure()
242   local myopts   local myopts
243   if [[ ! -z ${CTARGET} ]]   if [[ ! -z ${CTARGET} ]]
244   then   then
245   myopts="--target=${CTARGET}"   myopts+=" --target=${CTARGET}"
246   fi   fi
247    
248   if [ -x ./configure ]   if [ -x ./configure ]
249   then   then
250     # if requested disable-static
251     if [[ ! -z $(./configure --help | grep -- '--.*able-static') ]]
252     then
253     if mqueryfeature '!static'
254     then
255     myopts+=" --disable-static"
256     else
257     myopts+=" --enable-static"
258     fi
259     fi
260    
261     # always enable shared by default
262     if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]]
263     then
264     myopts+=" --enable-shared"
265     fi
266    
267   ./configure \   ./configure \
268   --prefix=/usr \   --prefix=/usr \
269   --host=${CHOST} \   --host=${CHOST} \
# Line 436  minstalldocs() Line 453  minstalldocs()
453   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}."   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}."
454   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}."   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}."
455   else   else
456   install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."   install -m 0644 ${doc} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."
457   fi   fi
458   fi   fi
459   done   done

Legend:
Removed from v.1630  
changed lines
  Added in v.1633