--- trunk/mage/usr/lib/mage/smage2.sh 2005/08/20 15:55:19 196 +++ trunk/mage/usr/lib/mage/smage2.sh 2005/08/20 15:58:12 197 @@ -4,7 +4,7 @@ # needs pkgbuild_dir (mage) # SMAGE2 -# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.27 2005-08-20 15:55:19 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.28 2005-08-20 15:58:12 niro Exp $ #01.10.2004 # added ccache support @@ -508,7 +508,7 @@ > ${dest} # header - echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.27 2005-08-20 15:55:19 niro Exp $' >> ${dest} + echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.28 2005-08-20 15:58:12 niro Exp $' >> ${dest} echo >> ${dest} # pgkname and state @@ -523,29 +523,29 @@ # special tags and vars echo "PKGTYPE=\"${PKGTYPE}\"" >> ${dest} - if [ -n "${INHERITS}" ] + # add special vars + if [ -n "${SPECIAL_VARS}" ] then - echo -n "minclude" >> ${dest} local i - for i in ${INHERITS} + for i in ${SPECIAL_VARS} do - echo -n " ${i}" >> ${dest} + # being tricky here :) + echo "${i}=\"$(eval echo \$${i})\"" >> ${dest} done echo >> ${dest} fi - echo >> ${dest} - - # add special vars - if [ -n "${SPECIAL_VARS}" ] + # add at least all includes + if [ -n "${INHERITS}" ] then + echo -n "minclude" >> ${dest} local i - for i in ${SPECIAL_VARS} + for i in ${INHERITS} do - # being tricky here :) - echo "${i}=\"$(eval echo \$${i})\"" >> ${dest} + echo -n " ${i}" >> ${dest} done echo >> ${dest} fi + echo >> ${dest} # deps and provides echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}