From 8f215f876969af4a3e8dcd8e0e89348b9fb3d6e9 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 8 Jul 2012 19:18:30 +0200 Subject: [PATCH] build-sys: simplify don't need all sed stuff and ignoring of .git, since we don't run this in the top level, and hence never find a .git, second we don't want .* stuff, so we can just use * and make our lives much easier --- bin/Makefile.in | 9 +-------- pym/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/bin/Makefile.in b/bin/Makefile.in index bd751c986..9a5b59aba 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -35,18 +35,11 @@ usr_sbinprogs = \ readpecoff \ regenworld -# This is just a lazy hack for not having to list all files individually -# FIXME: make it a list (so it becomes explicit) and use an -# AM_CONDITIONAL to not include the sed wrapper in it when a Prefix is -# active. -list_sourcedir_dirs = \ - ( cd "$(srcdir)" && find . -name '.svn' -prune -o -type d -print ) - all: install: $(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(PORTAGE_BIN) - $(list_sourcedir_dirs) | while read f ; do \ + ( cd "$(srcdir)" && find * -type d ) | while read f ; do \ files=( ) ; \ for t in "$(srcdir)/$${f}"/* ; do \ [[ -d $${t} ]] && continue ; \ diff --git a/pym/Makefile.in b/pym/Makefile.in index f9a963651..4db3a7556 100644 --- a/pym/Makefile.in +++ b/pym/Makefile.in @@ -20,7 +20,7 @@ all: install: $(INSTALL) -d -m 755 -o "$(portageuser)" -g "$(portagegroup)" $(DESTDIR)$(PORTAGE_PYM) - ( cd "$(srcdir)" && find . -name '.git' -prune -o -type d -print | sed 's|^./\?||' ) | while read f ; do \ + ( cd "$(srcdir)" && find * -type d ) | while read f ; do \ $(INSTALL) -d -m 755 \ -o "$(portageuser)" -g "$(portagegroup)" \ "$(DESTDIR)$(PORTAGE_PYM)/$${f}" && \ -- 2.26.2