From 4f39d4a8bb7efd37240fb50c052135c84b239a7e Mon Sep 17 00:00:00 2001
From: "David J. MacKenzie" <djm@gnu.org>
Date: Wed, 28 Sep 1994 17:34:10 +0000
Subject: [PATCH] fix dist for no subdirs

---
 automake.in     | 3 ++-
 compile-vars.am | 1 +
 dist.am         | 4 ----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/automake.in b/automake.in
index b4f400af..23c0b6b5 100755
--- a/automake.in
+++ b/automake.in
@@ -187,7 +187,8 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4
      cat $AM_DIR/dist-subd.am >&5 ;;
   *) test "$target_distname" != explicit && cat $AM_DIR/distname.am >&5
      cat $AM_DIR/dist-vars.am >&4
-     cat $AM_DIR/dist.am >&5 ;;
+     if test -n "SUBDIRS"; then cat $AM_DIR/dist-subd-top.am >&5
+     else cat $AM_DIR/dist.am >&5; fi ;;
   esac
 
   cat $AM_DIR/footer.am >&5
diff --git a/compile-vars.am b/compile-vars.am
index 4105e7fe..87f890aa 100644
--- a/compile-vars.am
+++ b/compile-vars.am
@@ -4,6 +4,7 @@ YACC = @YACC@
 ANSI2KNR = ./ansi2knr
 
 DEFS = @DEFS@
+CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
diff --git a/dist.am b/dist.am
index f3e432c3..e497379f 100644
--- a/dist.am
+++ b/dist.am
@@ -5,10 +5,6 @@ dist: $(DIST_FILES) distname
 	  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 \
-	  (cd $$subdir; $(MAKE) subdir=$$subdir $@); done; \
-	fi
 	chmod -R a+r `cat distname`
 	tar -chozf `cat distname`.tar.gz `cat distname`
 	rm -rf `cat distname` distname
-- 
2.43.5