From: Fabian Groffen <grobian@gentoo.org>
Date: Thu, 12 Mar 2009 20:01:45 +0000 (-0000)
Subject: attempt to install ebuild helpers in their own directory
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=318e8b588d78baa2debfd979463612786fe8257b;p=portage.git

attempt to install ebuild helpers in their own directory

svn path=/main/branches/prefix/; revision=13098
---

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 28ed22699..da7d98f44 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -10,6 +10,7 @@ portageuser = @portageuser@
 portagegroup = @portagegroup@
 
 PORTAGE_BIN = @PORTAGE_BASE@/bin
+EBUILD_HELPER_BIN = $(PORTAGE_BIN)/ebuild-helpers
 LN_S = @LN_S@
 INSTALL = @INSTALL@
 INSTALL_script = @INSTALL_PROGRAM@ -o "$(portageuser)" -g "$(portagegroup)" -m 755
@@ -35,9 +36,14 @@ user_sbinprogs = \
 	fixpackages \
 	regenworld
 
+ebuild_helperprogs = \
+	( cd ${srcdir}/ebuild-helpers && find . -name 'Makefile*' -prune \
+	-o -name '.svn' -prune -o type f -print )
+
 list_sourcedir = \
-	  ( cd ${srcdir} && find . -name 'CVS' -prune -o -name '.\#*' -prune -o -name 'Makefile*' -prune \
-	  -o -name '.svn' -prune -o -type f -print )
+	  ( cd ${srcdir} && find . -name 'Makefile*' -prune \
+	  -o -name '.svn' -prune -o -name 'ebuild-helpers' -prune \
+	  -o -type f -print )
 
 all:
 
@@ -47,6 +53,11 @@ install:
 	; do echo "$(INSTALL_scriptsubst) ${srcdir}/$${f} $(DESTDIR)$(PORTAGE_BIN)/$${f}" \
 	   ; $(INSTALL_scriptsubst) ${srcdir}/$${f} $(DESTDIR)$(PORTAGE_BIN)/$${f} \
 	; done
+	$(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(EBUILD_HELPER_BIN)
+	$(ebuild_helperprogs) | while read f \
+	; do echo "$(INSTALL_scriptsubst) ${srcdir}/ebuild-helpers/$${f} $(DESTDIR)$(EBUILD_HELPER_BIN)/$${f}" \
+	   ; $(INSTALL_scriptsubst) ${srcdir}/ebuild-helpers/$${f} $(DESTDIR)$(EBUILD_HELPER_BIN)/$${f} \
+	; done
 	$(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(prefix)/bin
 	cd $(DESTDIR)$(prefix)/bin \
 	; for p in $(user_binprogs) \
@@ -73,6 +84,10 @@ uninstall:
 	; do echo "rm -f $(DESTDIR)$(PORTAGE_BIN)/$${f}" \
 	   ; rm -f $(DESTDIR)$(PORTAGE_BIN)/$${f} \
 	; done
+	$(ebuild_helperprogs) | while read f \
+	; do echo "rm -f $(DESTDIR)$(EBUILD_HELPER_BIN)/$${f}" \
+	   ; rm -f $(DESTDIR)$(EBUILD_HELPER_BIN)/$${f} \
+	; done
 	for p in $(user_binprogs) \
 	; do echo "rm -f $(DESTDIR)$(prefix)/bin/$${p}" \
 	   ; rm -f $(DESTDIR)$(prefix)/bin/$${p} \