sys-devel/automake: respect $ED #582734

diff --git a/sys-devel/automake/automake-1.10.3-r1.ebuild b/sys-devel/automake/automake-1.10.3-r1.ebuild
index dde41deb150c2582c1fac059435608d65e79b04e..a7faad7994d251e50e94ce738e9a378ce7650d27 100644 (file)
--- a/sys-devel/automake/automake-1.10.3-r1.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r1.ebuild
@@ -36,7 +36,7 @@ src_configure() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -71,7 +71,7 @@ src_install() {
        for x in aclocal automake ; do
                help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
                doman ${x}-${SLOT}.1
-               rm -f "${D}"/usr/bin/${x}
+               rm -f "${ED}"/usr/bin/${x}
        done
 
        # remove all config.guess and config.sub files replacing them

diff --git a/sys-devel/automake/automake-1.10.3-r2.ebuild b/sys-devel/automake/automake-1.10.3-r2.ebuild
index de41a4fa3bbc2f5b36ab59eb6d9829a74b2e0514..077f2ed70ed84d32346f8f4c62fd4acb62130e7b 100644 (file)
--- a/sys-devel/automake/automake-1.10.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r2.ebuild
@@ -37,7 +37,7 @@ src_configure() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -72,7 +72,7 @@ src_install() {
        for x in aclocal automake ; do
                help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
                doman ${x}-${SLOT}.1
-               rm -f "${D}"/usr/bin/${x}
+               rm -f "${ED}"/usr/bin/${x}
        done
 
        # remove all config.guess and config.sub files replacing them

diff --git a/sys-devel/automake/automake-1.11.6-r1.ebuild b/sys-devel/automake/automake-1.11.6-r1.ebuild
index b0bfdff4d5aab1ec04ba2be9f415dc29093c6e7e..cd077f96929c25c02d536b3c2e38a11989f4fd61 100644 (file)
--- a/sys-devel/automake/automake-1.11.6-r1.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r1.ebuild
@@ -45,7 +45,7 @@ src_compile() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -78,8 +78,8 @@ src_install() {
        dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.11.6-r2.ebuild b/sys-devel/automake/automake-1.11.6-r2.ebuild
index d6ead6fe036d50f97969d41659e7fb051b10bc96..c789fc1f2cfefbf8468a188e23b446a0c3966c9b 100644 (file)
--- a/sys-devel/automake/automake-1.11.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r2.ebuild
@@ -47,7 +47,7 @@ src_compile() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -80,8 +80,8 @@ src_install() {
        dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.12.6-r1.ebuild b/sys-devel/automake/automake-1.12.6-r1.ebuild
index f9c1334ce991baff9e7e0e9540ed286dd136cd21..6c76eae63edaea962d7e6e5acb24cc17d54abaac 100644 (file)
--- a/sys-devel/automake/automake-1.12.6-r1.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r1.ebuild
@@ -39,7 +39,7 @@ src_compile() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -69,13 +69,13 @@ src_install() {
        emake DESTDIR="${D}" install \
                APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
-       rm "${D}"/usr/share/aclocal/README || die
-       rmdir "${D}"/usr/share/aclocal || die
+       rm "${ED}"/usr/share/aclocal/README || die
+       rmdir "${ED}"/usr/share/aclocal || die
        dodoc AUTHORS ChangeLog NEWS README THANKS
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.12.6.ebuild b/sys-devel/automake/automake-1.12.6.ebuild
index 06a25a3e8519bf9de8c62d03e7755830addb75d7..6d117262fbb7b903d3a6ce4063db33c7da2e5f4d 100644 (file)
--- a/sys-devel/automake/automake-1.12.6.ebuild
+++ b/sys-devel/automake/automake-1.12.6.ebuild
@@ -38,7 +38,7 @@ src_compile() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -68,13 +68,13 @@ src_install() {
        emake DESTDIR="${D}" install \
                APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
-       rm "${D}"/usr/share/aclocal/README || die
-       rmdir "${D}"/usr/share/aclocal || die
+       rm "${ED}"/usr/share/aclocal/README || die
+       rmdir "${ED}"/usr/share/aclocal || die
        dodoc AUTHORS ChangeLog NEWS README THANKS
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.13.4-r1.ebuild b/sys-devel/automake/automake-1.13.4-r1.ebuild
index 6e12d6022d21fba7d3fc35ab5a9d23d2b99b8e3a..3f1d61e94c1e3762e889476143685aad9cdc0c6c 100644 (file)
--- a/sys-devel/automake/automake-1.13.4-r1.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r1.ebuild
@@ -44,7 +44,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -74,13 +74,13 @@ src_install() {
        emake DESTDIR="${D}" install \
                APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
-       rm "${D}"/usr/share/aclocal/README || die
-       rmdir "${D}"/usr/share/aclocal || die
+       rm "${ED}"/usr/share/aclocal/README || die
+       rmdir "${ED}"/usr/share/aclocal || die
        dodoc AUTHORS ChangeLog NEWS README THANKS
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.13.4.ebuild b/sys-devel/automake/automake-1.13.4.ebuild
index 57f143ba8ad2788676c6e02ed7cd901679bacde7..320aaf6feb266735ab30dd13b1c929642e4afa56 100644 (file)
--- a/sys-devel/automake/automake-1.13.4.ebuild
+++ b/sys-devel/automake/automake-1.13.4.ebuild
@@ -43,7 +43,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -73,13 +73,13 @@ src_install() {
        emake DESTDIR="${D}" install \
                APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
-       rm "${D}"/usr/share/aclocal/README || die
-       rmdir "${D}"/usr/share/aclocal || die
+       rm "${ED}"/usr/share/aclocal/README || die
+       rmdir "${ED}"/usr/share/aclocal || die
        dodoc AUTHORS ChangeLog NEWS README THANKS
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.14.1-r1.ebuild b/sys-devel/automake/automake-1.14.1-r1.ebuild
index b1e9964ae94c59161883cf016a21c7b53ed502d3..53723929eea1c2658b53c3dd743576d7037479af 100644 (file)
--- a/sys-devel/automake/automake-1.14.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r1.ebuild
@@ -56,7 +56,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -86,13 +86,13 @@ src_install() {
        emake DESTDIR="${D}" install \
                APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
-       rm "${D}"/usr/share/aclocal/README || die
-       rmdir "${D}"/usr/share/aclocal || die
+       rm "${ED}"/usr/share/aclocal/README || die
+       rmdir "${ED}"/usr/share/aclocal || die
        dodoc AUTHORS ChangeLog NEWS README THANKS
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.14.1.ebuild b/sys-devel/automake/automake-1.14.1.ebuild
index 3d5a9585f03c11a2ad37652344179c92fcc1a2e9..5ebd9675685835a8a70df7625e38b7b0d43dd1f8 100644 (file)
--- a/sys-devel/automake/automake-1.14.1.ebuild
+++ b/sys-devel/automake/automake-1.14.1.ebuild
@@ -55,7 +55,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -85,13 +85,13 @@ src_install() {
        emake DESTDIR="${D}" install \
                APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
-       rm "${D}"/usr/share/aclocal/README || die
-       rmdir "${D}"/usr/share/aclocal || die
+       rm "${ED}"/usr/share/aclocal/README || die
+       rmdir "${ED}"/usr/share/aclocal || die
        dodoc AUTHORS ChangeLog NEWS README THANKS
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.15-r1.ebuild b/sys-devel/automake/automake-1.15-r1.ebuild
index b1e9964ae94c59161883cf016a21c7b53ed502d3..53723929eea1c2658b53c3dd743576d7037479af 100644 (file)
--- a/sys-devel/automake/automake-1.15-r1.ebuild
+++ b/sys-devel/automake/automake-1.15-r1.ebuild
@@ -56,7 +56,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -86,13 +86,13 @@ src_install() {
        emake DESTDIR="${D}" install \
                APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
-       rm "${D}"/usr/share/aclocal/README || die
-       rmdir "${D}"/usr/share/aclocal || die
+       rm "${ED}"/usr/share/aclocal/README || die
+       rmdir "${ED}"/usr/share/aclocal || die
        dodoc AUTHORS ChangeLog NEWS README THANKS
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.15-r2.ebuild b/sys-devel/automake/automake-1.15-r2.ebuild
index 8e774977cae5fd90384c5064748543c6bd6107f6..a2262d26f9296a5888a12d5ccdf1676eab826f12 100644 (file)
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ b/sys-devel/automake/automake-1.15-r2.ebuild
@@ -57,7 +57,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -87,13 +87,13 @@ src_install() {
        emake DESTDIR="${D}" install \
                APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
-       rm "${D}"/usr/share/aclocal/README || die
-       rmdir "${D}"/usr/share/aclocal || die
+       rm "${ED}"/usr/share/aclocal/README || die
+       rmdir "${ED}"/usr/share/aclocal || die
        dodoc AUTHORS ChangeLog NEWS README THANKS
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.15.ebuild b/sys-devel/automake/automake-1.15.ebuild
index 3d5a9585f03c11a2ad37652344179c92fcc1a2e9..5ebd9675685835a8a70df7625e38b7b0d43dd1f8 100644 (file)
--- a/sys-devel/automake/automake-1.15.ebuild
+++ b/sys-devel/automake/automake-1.15.ebuild
@@ -55,7 +55,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -85,13 +85,13 @@ src_install() {
        emake DESTDIR="${D}" install \
                APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
-       rm "${D}"/usr/share/aclocal/README || die
-       rmdir "${D}"/usr/share/aclocal || die
+       rm "${ED}"/usr/share/aclocal/README || die
+       rmdir "${ED}"/usr/share/aclocal || die
        dodoc AUTHORS ChangeLog NEWS README THANKS
 
        rm \
-               "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+               "${ED}"/usr/bin/{aclocal,automake} \
+               "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
index e72c741c0964938caf7cac7c70ff98c209ad75b6..ccb6b0e7b3cf36b47d2f3680add27026d1e55927 100644 (file)
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r2.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -71,7 +71,7 @@ src_install() {
                pkgdatadir=/usr/share/automake-${SLOT} \
                m4datadir=/usr/share/aclocal-${SLOT}
        slot_info_pages
-       rm -f "${D}"/usr/bin/{aclocal,automake}
+       rm -f "${ED}"/usr/bin/{aclocal,automake}
        dosym automake-${SLOT} /usr/share/automake
 
        dodoc NEWS README THANKS TODO AUTHORS ChangeLog

diff --git a/sys-devel/automake/automake-1.5-r2.ebuild b/sys-devel/automake/automake-1.5-r2.ebuild
index 467a825477d03d5d18d05088ce35ef383d211f77..6a3362f1c9a965267f5a07e0958146458ecdaf19 100644 (file)
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ b/sys-devel/automake/automake-1.5-r2.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -68,8 +68,8 @@ src_install() {
 
        local x
        for x in aclocal automake ; do
-               mv "${D}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}"
-               mv "${D}"/usr/share/${x}{,-${SLOT}} || die "move ${x}"
+               mv "${ED}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}"
+               mv "${ED}"/usr/share/${x}{,-${SLOT}} || die "move ${x}"
        done
 
        # remove all config.guess and config.sub files replacing them

diff --git a/sys-devel/automake/automake-1.6.3-r2.ebuild b/sys-devel/automake/automake-1.6.3-r2.ebuild
index 212b6cd7c825a2bb9cabaf66335d845ba6716453..cc812b0f4ed2c5510094d3243f55e3a8bfacc760 100644 (file)
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r2.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -62,7 +62,7 @@ slot_info_pages() {
 src_install() {
        default
        slot_info_pages
-       rm -f "${D}"/usr/bin/{aclocal,automake}
+       rm -f "${ED}"/usr/bin/{aclocal,automake}
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.7.9-r3.ebuild b/sys-devel/automake/automake-1.7.9-r3.ebuild
index cbb9c79f88028ef9a35af41f8d1062aaf3a78011..850938f15078f3aa9be4a849b38cba7be5e8359a 100644 (file)
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r3.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -65,7 +65,7 @@ slot_info_pages() {
 src_install() {
        default
        slot_info_pages
-       rm -f "${D}"/usr/bin/{aclocal,automake}
+       rm -f "${ED}"/usr/bin/{aclocal,automake}
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.8.5-r5.ebuild b/sys-devel/automake/automake-1.8.5-r5.ebuild
index b2be27b73fecc225ba81bf6bcefdc0c021824dde..6a2438166f881daf0e103568e851f32b128bdc52 100644 (file)
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r5.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -65,7 +65,7 @@ slot_info_pages() {
 src_install() {
        default
        slot_info_pages
-       rm -f "${D}"/usr/bin/{aclocal,automake}
+       rm -f "${ED}"/usr/bin/{aclocal,automake}
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version

diff --git a/sys-devel/automake/automake-1.9.6-r4.ebuild b/sys-devel/automake/automake-1.9.6-r4.ebuild
index d26eca3c484b401e4725acbd192e025113dc9e37..de96fc6618e71818343f44824029d076072d209f 100644 (file)
--- a/sys-devel/automake/automake-1.9.6-r4.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r4.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -73,7 +73,7 @@ src_install() {
        for x in aclocal automake ; do
                help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
                doman ${x}-${SLOT}.1
-               rm -f "${D}"/usr/bin/${x}
+               rm -f "${ED}"/usr/bin/${x}
        done
 
        # remove all config.guess and config.sub files replacing them

diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 48a6b310ffc081f459a6c1f8b4170eb3ef4ae5fb..38f880becb630f9138fb9d1efb73cd9cd79334f5 100644 (file)
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -45,7 +45,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-       pushd "${D}"/usr/share/info >/dev/null
+       pushd "${ED}"/usr/share/info >/dev/null
        rm -f dir
 
        # Rewrite all the references to other pages.
@@ -80,7 +80,7 @@ src_install() {
        for x in aclocal automake ; do
                help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
                doman ${x}-${SLOT}.1
-               rm -f "${D}"/usr/bin/${x}
+               rm -f "${ED}"/usr/bin/${x}
        done
 
        # remove all config.guess and config.sub files replacing them