--- trunk/mage/usr/lib/mage/smage2.sh 2005/08/21 21:23:48 199 +++ trunk/mage/usr/lib/mage/smage2.sh 2005/08/21 21:36:54 200 @@ -4,7 +4,7 @@ # needs pkgbuild_dir (mage) # SMAGE2 -# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.30 2005-08-21 21:23:48 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.31 2005-08-21 21:36:54 niro Exp $ #01.10.2004 # added ccache support @@ -426,23 +426,26 @@ do cat="$(dirname ${dep})" # change if not virtual - if [[ ${cat} != virtual ]] + if [[ ${cat} = virtual ]] then + pname="$(basename ${dep})" + else # fix pver to target-pver # to get pname-target-pver # doing it backwards ! pver="${dep##*-}" - pname=$(basename ${dep/-${pver}/}) + # full pver + pname="$(basename ${dep/-${pver}/})${target}-${pver}" fi # do not add empty lines if [ -z "${NDEPEND}" ] then - NDEPEND="${sym} ${cat}/${pname}${target}-${pver}" + NDEPEND="${sym} ${cat}/${pname}" else NDEPEND="${NDEPEND} - ${sym} ${cat}/${pname}${target}-${pver}" + ${sym} ${cat}/${pname}${target}" fi unset cat pname pver @@ -509,7 +512,7 @@ > ${dest} # header - echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.30 2005-08-21 21:23:48 niro Exp $' >> ${dest} + echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.31 2005-08-21 21:36:54 niro Exp $' >> ${dest} echo >> ${dest} # pgkname and state