commit:     ded2ef9b14efaebe080d3c228832cac7b48639e7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 09:35:25 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 09:35:25 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ded2ef9b

buildsys: fix hprefixify replacement logic for subst-inst

We don't need to escape \ in single-quoted strings.

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 autogen.sh       | 3 ---
 subst-install.in | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index ec510e01b0..463753c459 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,4 @@ autoconf || die "failed autoconf"
 touch ChangeLog 
 automake -a -c || die "failed automake"
 
-if [ -x ./test.sh ] ; then
-       exec ./test.sh "$@"
-fi
 echo "finished"

diff --git a/subst-install.in b/subst-install.in
index acc7824c4b..423dfad515 100644
--- a/subst-install.in
+++ b/subst-install.in
@@ -35,8 +35,8 @@ sedexp=(
        -e "s,${at}rootuid${at},@rootuid@,g"
        -e "s,${at}rootuser${at},${rootuser},g"
        -e "s,${at}sysconfdir${at},@sysconfdir@,g"
-       -e 's,([^[:alnum:]}\\)\\.])'"${dirs}"',\\1@PORTAGE_EPREFIX@/\\2,g'
-       -e 's,^'"${dirs}"',@PORTAGE_EPREFIX@/\\1,'
+       -e 's,([^[:alnum:]}\)\.])'"${dirs}"',\1@PORTAGE_EPREFIX@/\2,g'
+       -e 's,^'"${dirs}"',@PORTAGE_EPREFIX@/\1,'
 )
 
 sources=( )

Reply via email to