[gentoo-commits] proj/portage:prefix commit in: bin/, cnf/

[Fabian Groffen]

commit:     4ca33cc09162af9fddc0246292547ab2a74d4323
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 16:13:39 2024 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 16:13:39 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=4ca33cc0

buildsys: avoid overuse of hprefixify

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

 bin/Makefile.in | 11 ++++++++++-
 cnf/Makefile.in |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 3f0e54190a..e6dc6724ff 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -14,7 +14,7 @@ portagegroup = @portagegroup@
 PORTAGE_BIN = @PORTAGE_BASE@/bin
 LN_S = @LN_S@
 INSTALL = @INSTALL@
-INSTALL_subst = $(top_builddir)/subst-install --hprefixify
+INSTALL_subst = $(top_builddir)/subst-install
 
 usr_binprogs = \
        ebuild \
@@ -34,6 +34,9 @@ usr_sbinprogs = \
        fixpackages \
        regenworld
 
+hprefixify_progs = \
+       etc-update
+
 all:
 
 install:
@@ -54,6 +57,12 @@ install:
                        -o "$(portageuser)" -g "$(portagegroup)" \
                        -t "$(DESTDIR)$(PORTAGE_BIN)/$${f}" \
                        "$${files[@]}" ; \
+       done ; \
+       for f in $(hprefixify_progs) ; do \
+               $(INSTALL_subst) --hprefixify -m 755 \
+                       -o "$(portageuser)" -g "$(portagegroup)" \
+                       -t "$(DESTDIR)$(PORTAGE_BIN)" \
+                       "$(srcdir)/$${f}" ; \
        done
        $(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" 
$(DESTDIR)$(prefix)/bin
        cd $(DESTDIR)$(prefix)/bin \

diff --git a/cnf/Makefile.in b/cnf/Makefile.in
index 803382bd3f..64d2fa7a78 100644
--- a/cnf/Makefile.in
+++ b/cnf/Makefile.in
@@ -37,6 +37,6 @@ install:
                -t "$(DESTDIR)$(sysconfdir)" \
                "$(srcdir)"/dispatch-conf.conf \
                "$(srcdir)"/etc-update.conf
-       ( cd $(DESTDIR)$(sysconfdir) && $(LN_S) 
$(DESTDIR)$(PORTAGE_CONF)/make.globals )
+       ( cd $(DESTDIR)$(sysconfdir) && rm -f make.globals && $(LN_S) 
$(DESTDIR)$(PORTAGE_CONF)/make.globals )
 
 .PHONY:        all install