diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-09-29 21:23:32 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-09-29 21:23:32 +0000 |
| commit | e31413b58cf1bef87e6c33ca067e17c0e2d1fdfc (patch) | |
| tree | 46491e058e8c385477fd6d3c7477d6b08512ce23 | |
| parent | 6ec356cb13cb436ff893cc46790bf823d320f353 (diff) | |
| download | portage-e31413b58cf1bef87e6c33ca067e17c0e2d1fdfc.tar.gz portage-e31413b58cf1bef87e6c33ca067e17c0e2d1fdfc.tar.bz2 portage-e31413b58cf1bef87e6c33ca067e17c0e2d1fdfc.zip | |
Remove redundant trailing slashes from ${D}. (branches/prefix r7886)
svn path=/main/trunk/; revision=7890
| -rwxr-xr-x | bin/ebuild.sh | 31 |
1 files changed, 17 insertions, 14 deletions
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 |