--- trunk/mage/usr/lib/mage/smage2.sh	2009/11/20 22:39:11	943
+++ trunk/mage/usr/lib/mage/smage2.sh	2010/06/28 17:48:58	1082
@@ -530,11 +530,15 @@
 		install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."
 	fi
 
+	local i
 	for i in ${docfiles}
 	do
-		cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
-		install -m 0644 ${SRCDIR}/${i}.gz \
-			${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
+		if [ -f ${i} ]
+		then
+			cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
+			install -m 0644 ${SRCDIR}/${i}.gz \
+				${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
+		fi
 	done
 }
 
@@ -844,10 +848,12 @@
 				export PNAME="${i}"
 				split_info_${i}
 				build_mage_script --split-pkg-base "${split_pkg_base}"
+				# restore smage environment
+				split_restore_variables
 			done
 			echo
-			# restore smage environment
-			split_restore_variables
+			# unset all saved smage variables
+			split_unset_variables
 
 		else
 			echo
@@ -898,6 +904,13 @@
 	export SAVED_DEPEND="${DEPEND}"
 	export SAVED_SDEPEND="${SDEPEND}"
 	export SAVED_PROVIDE="${PROVIDE}"
+	export SAVED_NOPKGBUILD="${NOPKGBUILD}"
+
+	# bindir too
+	export SAVED_BINDIR="${BINDIR}"
+
+	# export the SPLIT_PACKAGE_BASE
+	export SPLIT_PACKAGE_BASE="${SAVED_PNAME}"
 
 	# functions
 	if [[ ! -z $(typeset -f preinstall) ]]
@@ -952,6 +965,10 @@
 	export DEPEND="${SAVED_DEPEND}"
 	export SDEPEND="${SAVED_SDEPEND}"
 	export PROVIDE="${SAVED_PROVIDE}"
+	export NOPKGBUILD="${SAVED_NOPKGBUILD}"
+
+	# bindir too
+	export BINDIR="${SAVED_BINDIR}"
 
 	# functions
 	if [[ ! -z $(typeset -f SAVED_preinstall) ]]
@@ -989,7 +1006,10 @@
 		eval "${saved_postremove/SAVED_/}"
 		export -f postremove
 	fi
+}
 
+split_unset_variables()
+{
 	# unset saved vars; not needed anymore
 	unset SAVED_PNAME
 	unset SAVED_PVER
@@ -1004,6 +1024,9 @@
 	unset SAVED_DEPEND
 	unset SAVED_SDEPEND
 	unset SAVED_PROVIDE
+	unset SAVED_BINDIR
+	unset SAVED_NOPKGBUILD
+	unset SPLIT_PACKAGE_BASE
 	unset -f SAVED_preinstall
 	unset -f SAVED_postinstall
 	unset -f SAVED_preremove
@@ -1133,7 +1156,7 @@
 {
 	if [[ ${STEP_BY_STEP} = true ]]
 	then
-		echo "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
+		echo -e "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
 		echo "Press [enter] to continue"
 		read
 	fi
@@ -1278,7 +1301,7 @@
 	elif [[ -n ${SPLIT_PACKAGES} ]]
 	then
 		split_save_variables
-		for subpackage in ${SPLIT_PACKAGE}
+		for subpackage in ${SPLIT_PACKAGES}
 		do
 			# get the right variables for the split
 			export PNAME="${subpackage}"
@@ -1290,8 +1313,11 @@
 				--pver "${PVER}" \
 				--pbuild "${PBUILD}" \
 				--parch "${ARCH}"
+			# restore smage environment
+			split_restore_variables
 		done
-		split_restore_variables
+		# unset all saved smage variables
+		split_unset_variables
 
 	else
 		# build md5sum for existing packages
@@ -1456,7 +1482,8 @@
 # build several subpackages
 if [[ -n ${SPLIT_PACKAGES} ]]
 then
-	# save bindir
+	# save bindir & pname
+	split_save_variables
 	export SAVED_BINDIR="${BINDIR}"
 	for subpackage in ${SPLIT_PACKAGES}
 	do
@@ -1464,26 +1491,35 @@
 		then
 			# export subpackage bindir
 			export BINDIR="${SAVED_BINDIR}_${subpackage}"
+			# export PNAME, several internal function and include
+			# rely on this variable
+			export PNAME="${subpackage}"
+
+			echo
+			echo -en "${COLBLUE}*** ${COLDEFAULT}"
+			echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"
+			echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
+			echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
+
 			src_install_${subpackage} | ${SMAGE_LOG_CMD}
 			die_pipestatus 0 "src_install_${subpackage} failed"
 			step_by_step $_
 		fi
 	done
-	# restore bindir
-	export BINDIR="${SAVED_BINDIR}"
-	unset SAVED_BINDIR
+	# restore bindir & pname
+	split_restore_variables
+	# unset all saved smage variables
+	split_unset_variables
 else
 	src_install | ${SMAGE_LOG_CMD}
 	die_pipestatus 0 "src_install failed"
 	step_by_step $_
 fi
 
-echo -e "${COLGREEN}DEB${COLRED}UG!${COLDEFAULT}"
-
 # compressing doc, info & man files
 if [[ -n ${SPLIT_PACKAGES} ]]
 then
-	for subpackage in ${SPLIT_PACKAGE}
+	for subpackage in ${SPLIT_PACKAGES}
 	do
 		mcompressdocs ${BINDIR}_${subpackage}
 	done
@@ -1500,11 +1536,11 @@
 	*)
 		if [[ -n ${SPLIT_PACKAGES} ]]
 		then
-			for subpackage in ${SPLIT_PACKAGE}
+			for subpackage in ${SPLIT_PACKAGES}
 			do
-				echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
+				echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
 				mstripbins ${BINDIR}_${subpackage}
-				echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
+				echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"
 				mstriplibs ${BINDIR}_${subpackage}
 			done
 		else
@@ -1560,6 +1596,11 @@
 				export PNAME="${subpackage}"
 				split_info_${PNAME}
 
+				# jump to next one if NOPKGBUILD is set in split_info
+				case ${NOPKGBUILD} in
+					true|TRUE|yes|y) continue ;;
+				esac
+
 				# check if an special subpackage_pkgbuild exists
 				if typeset -f ${PNAME}_pkgbuild > /dev/null
 				then
@@ -1580,8 +1621,12 @@
 					--parch "${ARCH}"
 
 				echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
+
+				# restore smage environment
+				split_restore_variables
 			done
-			split_restore_variables
+			# unset all saved smage variables
+			split_unset_variables
 
 		else
 			${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"