fix rules and dist

diff --git a/automake.in b/automake.in
index 26d1bacac6e40f5990e19af63654d539b1a331eb..cf0670fff5349a11f4553fc8da73568af968186e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -185,8 +185,8 @@ ${am_file}_OBJECTS = ${am_file}.\${kr}o" >&4
 
   cat $AM_DIR/footer.am >&5
 
-  sed '/^ *\([a-zA-Z_.][a-zA-Z0-9_. ]*\):.*/,$d' ${am_makefile}.am >&4
-  sed -n '/^ *\([a-zA-Z_.][a-zA-Z0-9_. ]*\):.*/,$p' ${am_makefile}.am >&5
+  sed '/^[^#=]*:/,$d' ${am_makefile}.am >&4
+  sed -n '/^[^#=]*:/,$p' ${am_makefile}.am >&5
   cat ${am_makefile}.vars ${am_makefile}.rules > ${am_makefile}.in
   rm -f ${am_makefile}.vars ${am_makefile}.rules
 

diff --git a/dist-subd.am b/dist-subd.am
index a735f9e84b9a2f3fca3de10966297c1d6b3be11f..50bb14d430d867a0fe2e413f2c786fe1fb90012b 100644 (file)
--- a/dist-subd.am
+++ b/dist-subd.am
@@ -1,7 +1,8 @@
 dist: $(DIST_FILES)
        mkdir ../`cat ../distname`/$(subdir)
-       @echo "Copying distribution files"
        @for file in $(DIST_FILES); do \
-         cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir); \
+         echo linking $$file; \
+         ln $(srcdir)/$$file ../`cat ../distname`/$(subdir) || \
+           { echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir);}; \
        done
 

diff --git a/dist.am b/dist.am
index a82b8c4ce4afb5fbce8ad09fa782807da2948907..f3e432c3b0bec86af43edf501ad89a3d04c9b788 100644 (file)
--- a/dist.am
+++ b/dist.am
@@ -1,8 +1,9 @@
 dist: $(DIST_FILES) distname
        rm -rf `cat distname`; mkdir `cat distname`
-       @echo "Copying distribution files"
        @for file in $(DIST_FILES); do \
-         cp -p $(srcdir)/$$file `cat distname`; \
+         echo linking $$file; \
+         ln $(srcdir)/$$file `cat distname` || \
+           { echo copying $$file instead; cp -p $(srcdir)/$$file `cat distname`;}; \
        done
        if test -n "$(SUBDIRS)"; then \
        for subdir in $(SUBDIRS); do \