[bug-gsrc] /srv/bzr/gsrc/trunk r760: fix make dist+clean

[Brian Gough]

------------------------------------------------------------
revno: 760
committer: Brian Gough <address@hidden>
branch nick: trunk
timestamp: Mon 2011-08-08 17:46:55 +0100
message:
  fix make dist+clean
modified:
  GNUmakefile.am

=== modified file 'GNUmakefile.am'
--- a/GNUmakefile.am    2010-12-20 14:12:01 +0000
+++ b/GNUmakefile.am    2011-08-08 16:46:55 +0000
@@ -1,5 +1,5 @@
 SUBDIRS = doc
-EXTRA_DIST = gar.mk gar.master.mk gar.conf.mk gar.env.mk gar.lib.mk 
gar.site.mk gar.lib/auto.mk deps alpha gnu
+EXTRA_DIST = gar.mk gar.master.mk gar.conf.mk gar.env.mk gar.lib.mk 
gar.site.mk gar.lib/auto.mk deps gnu
 
 GSRC =  gcc binutils gdb mpfr gmp
 GSRC += m4 make autoconf automake libtool bison gperf gawk
@@ -19,7 +19,9 @@
 
 find_packages = $(sort $(filter-out $(IGNORE),$(patsubst %/,%,$(filter 
%/,$(wildcard $(1))))))
 GNU_PACKAGES = $(call find_packages, gnu/*/)
-DEP_PACKAGES = $(call find_packages, dep/*/)
+DEP_PACKAGES = $(call find_packages, deps/*/)
+ALPHA_PACKAGES = $(call find_packages, alpha/*/)
+
 PACKAGES ?= $(GNU_PACKAGES) $(DEP_PACKAGES)
 
 all: PACKAGES = $(addprefix gnu/,$(GSRC))
@@ -46,11 +48,11 @@
            *k*) failcom='fail=yes';; \
          esac; \
        done; \
-       for i in $(PACKAGES) ; do \
+       for i in $(PACKAGES)  ; do \
                if [ -d $$i ] ; then $(MAKE) -C $$i $@ || eval $$failcom;  fi \
        done
 
 dist-hook:
-       rm -rf `find $(distdir) -name work -o -name cookies -o -name download 
-o -name logs`
+       rm -rf `find $(distdir) -name work -o -name cookies -o -name download 
-o -name logs -o -name .update-pending -o -name .update-timestamp -o -name 
.commit -o -name logmsg`