From: David J. MacKenzie <djm@gnu.org>
Date: Thu, 22 Sep 1994 03:45:02 +0000 (+0000)
Subject: fix rules and dist
X-Git-Tag: Release-0-25~451
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da7dda64a28c7d352b8a1d4f8fc9809a2f02662c;p=thirdparty%2Fautomake.git

fix rules and dist
---

diff --git a/automake.in b/automake.in
index 26d1bacac..cf0670fff 100755
--- 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 a735f9e84..50bb14d43 100644
--- 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 a82b8c4ce..f3e432c3b 100644
--- 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 \