--- trunk/mage/usr/lib/mage/smage2.sh 2012/01/13 18:31:48 1641 +++ trunk/mage/usr/lib/mage/smage2.sh 2012/01/13 21:04:02 1649 @@ -267,7 +267,7 @@ [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}" smagesource ${SMAGENAME} || die "source failed" -PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}" +PKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" MD5DIR="$(dirname ${SMAGENAME})/md5" SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log" @@ -553,7 +553,7 @@ fi # now create the target package run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \ - "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \ + "${PNAME}-${target}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \ ${BINDIR} || die "target: ${target} package-build failed" resume_stamp post-pkg_builddir_${target} @@ -567,7 +567,7 @@ --target "${target}" resume_stamp post-md5sum_${target} - echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}" + echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD} successfully builded.\n${COLDEFAULT}" done # build several subpackages @@ -592,7 +592,7 @@ fi # now create the target package run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \ - "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \ + "${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \ "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed" resume_stamp post-pkg_builddir_${PNAME} @@ -605,7 +605,7 @@ --parch "${ARCH}" resume_stamp post-md5sum_${PNAME} - echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}" + echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD} successfully builded.\n${COLDEFAULT}" # restore smage environment split_restore_variables