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

Parent Directory | Revision Log | Patch

	revision 1600 by niro, Mon Jan 2 15:51:28 2012 UTC	revision 1615 by niro, Mon Jan 9 20:09:41 2012 UTC
#	Line 237  mlibdir()	Line 237  mlibdir()
237
238	mconfigure()	mconfigure()
239	{	{
240		local myopts
241		if [[ ! -z ${CTARGET} ]]
242		then
243		myopts="--target=${CTARGET}"
244		fi
245
246	if [ -x ./configure ]	if [ -x ./configure ]
247	then	then
248	./configure \	./configure \
#	Line 249  mconfigure()	Line 255  mconfigure()
255	--sysconfdir=/etc \	--sysconfdir=/etc \
256	--localstatedir=/var/lib \	--localstatedir=/var/lib \
257	--libdir=/usr/$(mlibdir) \	--libdir=/usr/$(mlibdir) \
258		${myopts} \
259	"$@" || die "mconfigure failed"	"$@" || die "mconfigure failed"
260	else	else
261	echo "configure is not an executable ..."	echo "configure is not an executable ..."
#	Line 344  munpack()	Line 351  munpack()
351	rar)	rar)
352	unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."	unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
353	;;	;;
354	zip|xpi)	zip|xpi|jar)
355	unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."	unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
356	;;	;;
357	rpm)	rpm)
#	Line 424  minstalldocs()	Line 431  minstalldocs()
431	then	then
432	if mqueryfeature "compressdoc"	if mqueryfeature "compressdoc"
433	then	then
434	cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "gzipping +installing ${doc}."	cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}."
435	chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "fixing permissions of ${doc}."	chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}."
436	else	else
437	install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."	install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."
438	fi	fi
#	Line 465  mstriplibtoolarchive()	Line 472  mstriplibtoolarchive()
472	local stripdir="$@"	local stripdir="$@"
473
474	[[ -z ${stripdir} ]] && stripdir="${BINDIR}"	[[ -z ${stripdir} ]] && stripdir="${BINDIR}"
475	find ${stripdir} ! -type d -name \*.la | xargs --no-run-if-empty file | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null	find ${stripdir} ! -type d -name \*.la | xargs | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null
476	}	}
477
478	mpurgetargets()	mpurgetargets()
#	Line 899  split_restore_variables()	Line 906  split_restore_variables()
906
907	# special handling needed for mage features	# special handling needed for mage features
908	# pkgbuild	# pkgbuild
909	msetfeature "${SAVED_FEATURE_PKGBUILD}"	FVERBOSE=off msetfeature "${SAVED_FEATURE_PKGBUILD}"
910	# strip	# strip
911	msetfeature "${SAVED_FEATURE_STRIP}"	FVERBOSE=off msetfeature "${SAVED_FEATURE_STRIP}"
912	# libtool	# libtool
913	msetfeature "${SAVED_FEATURE_LIBTOOL}"	FVERBOSE=off msetfeature "${SAVED_FEATURE_LIBTOOL}"
914	# compressdoc	# compressdoc
915	msetfeature "${SAVED_FEATURE_COMPRESSDOC}"	FVERBOSE=off msetfeature "${SAVED_FEATURE_COMPRESSDOC}"
916
917	# bindir too	# bindir too
918	export BINDIR="${SAVED_BINDIR}"	export BINDIR="${SAVED_BINDIR}"

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.1600   changed lines   Added in v.1615