From: David J. MacKenzie <djm@gnu.org>
Date: Tue, 20 Sep 1994 00:56:23 +0000 (+0000)
Subject: fix dist
X-Git-Tag: Release-0-25~465
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcd8d593005169f8a42c9de320258f0e056bd333;p=thirdparty%2Fautomake.git

fix dist
---

diff --git a/dist-subd.am b/dist-subd.am
index d698c5379..a735f9e84 100644
--- a/dist-subd.am
+++ b/dist-subd.am
@@ -1,7 +1,7 @@
 dist: $(DIST_FILES)
-	mkdir ../`cat ../distname`/src
+	mkdir ../`cat ../distname`/$(subdir)
 	@echo "Copying distribution files"
 	@for file in $(DIST_FILES); do \
-	  cp -p $(srcdir)/$$file ../`cat ../distname`/src; \
+	  cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir); \
 	done
 
diff --git a/dist.am b/dist.am
index 6b476d5e8..a82b8c4ce 100644
--- a/dist.am
+++ b/dist.am
@@ -1,11 +1,12 @@
-dist: $(DIST_FILES)
+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`; \
 	done
 	if test -n "$(SUBDIRS)"; then \
-	for subdir in $(SUBDIRS); do (cd $$subdir; $(MAKE) $@); done;
+	for subdir in $(SUBDIRS); do \
+	  (cd $$subdir; $(MAKE) subdir=$$subdir $@); done; \
 	fi
 	chmod -R a+r `cat distname`
 	tar -chozf `cat distname`.tar.gz `cat distname`