--- trunk/mage/usr/lib/mage/smage2.sh	2012/01/13 18:29:52	1640
+++ trunk/mage/usr/lib/mage/smage2.sh	2012/01/13 21:04:02	1649
@@ -34,7 +34,7 @@
 showversion
 echo
 
-if [ -z "$1" ]
+if [[ -z ${SMAGENAME} ]]
 then
 	echo "No .smage2 file given. Exiting."
 	echo
@@ -161,7 +161,7 @@
 		do
 			# build md5sum for existing packages
 			generate_package_md5sum \
-				--pcat "${PCATEGORIE}" \
+				--pcat "${PCAT}" \
 				--pname "${PNAME}" \
 				--pver "${PVER}" \
 				--pbuild "${PBUILD}" \
@@ -180,7 +180,7 @@
 			split_info_${subpackage}
 			# build md5sum for existing packages
 			generate_package_md5sum \
-				--pcat "${PCATEGORIE}" \
+				--pcat "${PCAT}" \
 				--pname "${PNAME}" \
 				--pver "${PVER}" \
 				--pbuild "${PBUILD}" \
@@ -194,7 +194,7 @@
 	else
 		# build md5sum for existing packages
 		generate_package_md5sum \
-			--pcat "${PCATEGORIE}" \
+			--pcat "${PCAT}" \
 			--pname "${PNAME}" \
 			--pver "${PVER}" \
 			--pbuild "${PBUILD}" \
@@ -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,13 +553,13 @@
 				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}
 
 				# build pkg-md5-sum if requested
 				run_resume post-md5sum_${target} || generate_package_md5sum \
-					--pcat "${PCATEGORIE}" \
+					--pcat "${PCAT}" \
 					--pname "${PNAME}" \
 					--pver "${PVER}" \
 					--pbuild "${PBUILD}" \
@@ -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,20 +592,20 @@
 				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}
 
 				# build pkg-md5-sum if requested
 				run_resume post-md5sum_${PNAME} || generate_package_md5sum \
-					--pcat "${PCATEGORIE}" \
+					--pcat "${PCAT}" \
 					--pname "${PNAME}" \
 					--pver "${PVER}" \
 					--pbuild "${PBUILD}" \
 					--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
@@ -619,7 +619,7 @@
 
 			# build pkg-md5-sum if requested
 			run_resume post-md5sum || generate_package_md5sum \
-				--pcat "${PCATEGORIE}" \
+				--pcat "${PCAT}" \
 				--pname "${PNAME}" \
 				--pver "${PVER}" \
 				--pbuild "${PBUILD}" \