From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Sep 2007 21:23:32 +0000 (-0000)
Subject: Remove redundant trailing slashes from ${D}. (branches/prefix r7886)
X-Git-Tag: v2.2_pre1~752
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e31413b58cf1bef87e6c33ca067e17c0e2d1fdfc;p=portage.git

Remove redundant trailing slashes from ${D}. (branches/prefix r7886)

svn path=/main/trunk/; revision=7890
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 160bfa3f7..f5e625ed6 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -306,10 +306,13 @@ keepdir() {
 	local x
 	if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then
 		shift
-		find "$@" -type d -printf "${D}/%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" | tr "\n" "\0" | $XARGS -0 -n100 touch || die "Failed to recursively create .keep files"
+		find "$@" -type d -printf "${D}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \
+			| tr "\n" "\0" | ${XARGS} -0 -n100 touch || \
+			die "Failed to recursively create .keep files"
 	else
 		for x in "$@"; do
-			touch "${D}/${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || die "Failed to create .keep in ${D}/${x}"
+			touch "${D}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \
+				die "Failed to create .keep in ${D}${x}"
 		done
 	fi
 }
@@ -534,21 +537,21 @@ einstall() {
 
 	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
 		if [ "${PORTAGE_DEBUG}" == "1" ]; then
-			${MAKE:-make} -n prefix="${D}/usr" \
-				datadir="${D}/usr/share" \
-				infodir="${D}/usr/share/info" \
-				localstatedir="${D}/var/lib" \
-				mandir="${D}/usr/share/man" \
-				sysconfdir="${D}/etc" \
+			${MAKE:-make} -n prefix="${D}usr" \
+				datadir="${D}usr/share" \
+				infodir="${D}usr/share/info" \
+				localstatedir="${D}var/lib" \
+				mandir="${D}usr/share/man" \
+				sysconfdir="${D}etc" \
 				${LOCAL_EXTRA_EINSTALL} \
 				"$@" install
 		fi
-		${MAKE:-make} prefix="${D}/usr" \
-			datadir="${D}/usr/share" \
-			infodir="${D}/usr/share/info" \
-			localstatedir="${D}/var/lib" \
-			mandir="${D}/usr/share/man" \
-			sysconfdir="${D}/etc" \
+		${MAKE:-make} prefix="${D}usr" \
+			datadir="${D}usr/share" \
+			infodir="${D}usr/share/info" \
+			localstatedir="${D}var/lib" \
+			mandir="${D}usr/share/man" \
+			sysconfdir="${D}etc" \
 			${LOCAL_EXTRA_EINSTALL} \
 			"$@" install || die "einstall failed"
 	else