| 1 |
commit: 8f215f876969af4a3e8dcd8e0e89348b9fb3d6e9 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 8 17:18:30 2012 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 8 17:18:30 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8f215f87 |
| 7 |
|
| 8 |
build-sys: simplify |
| 9 |
|
| 10 |
don't need all sed stuff and ignoring of .git, since we don't run this |
| 11 |
in the top level, and hence never find a .git, second we don't want .* |
| 12 |
stuff, so we can just use * and make our lives much easier |
| 13 |
|
| 14 |
--- |
| 15 |
bin/Makefile.in | 9 +-------- |
| 16 |
pym/Makefile.in | 2 +- |
| 17 |
2 files changed, 2 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/bin/Makefile.in b/bin/Makefile.in |
| 20 |
index bd751c9..9a5b59a 100644 |
| 21 |
--- a/bin/Makefile.in |
| 22 |
+++ b/bin/Makefile.in |
| 23 |
@@ -35,18 +35,11 @@ usr_sbinprogs = \ |
| 24 |
readpecoff \ |
| 25 |
regenworld |
| 26 |
|
| 27 |
-# This is just a lazy hack for not having to list all files individually |
| 28 |
-# FIXME: make it a list (so it becomes explicit) and use an |
| 29 |
-# AM_CONDITIONAL to not include the sed wrapper in it when a Prefix is |
| 30 |
-# active. |
| 31 |
-list_sourcedir_dirs = \ |
| 32 |
- ( cd "$(srcdir)" && find . -name '.svn' -prune -o -type d -print ) |
| 33 |
- |
| 34 |
all: |
| 35 |
|
| 36 |
install: |
| 37 |
$(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(PORTAGE_BIN) |
| 38 |
- $(list_sourcedir_dirs) | while read f ; do \ |
| 39 |
+ ( cd "$(srcdir)" && find * -type d ) | while read f ; do \ |
| 40 |
files=( ) ; \ |
| 41 |
for t in "$(srcdir)/$${f}"/* ; do \ |
| 42 |
[[ -d $${t} ]] && continue ; \ |
| 43 |
|
| 44 |
diff --git a/pym/Makefile.in b/pym/Makefile.in |
| 45 |
index f9a9636..4db3a75 100644 |
| 46 |
--- a/pym/Makefile.in |
| 47 |
+++ b/pym/Makefile.in |
| 48 |
@@ -20,7 +20,7 @@ all: |
| 49 |
|
| 50 |
install: |
| 51 |
$(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(PORTAGE_PYM) |
| 52 |
- ( cd "$(srcdir)" && find . -name '.git' -prune -o -type d -print | sed 's|^./\?||' ) | while read f ; do \ |
| 53 |
+ ( cd "$(srcdir)" && find * -type d ) | while read f ; do \ |
| 54 |
$(INSTALL) -d -m 755 \ |
| 55 |
-o "$(portageuser)" -g "$(portagegroup)" \ |
| 56 |
"$(DESTDIR)$(PORTAGE_PYM)/$${f}" && \ |
Archives