fix dist for no subdirs

diff --git a/automake.in b/automake.in
index b4f400afa5c8d6bc6e8aa3c7ead7287ce4796f87..23c0b6b5c2ea77d4b29e9523e274fd3a58e2a306 100755 (executable)
--- 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 4105e7febd718bf16b0b79a79a663d38707bbeba..87f890aafefcfc2e682e4eea7a41c75d644ef00e 100644 (file)
--- 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 f3e432c3b0bec86af43edf501ad89a3d04c9b788..e497379fb00817143eeaef0e66755b13a4d2b27c 100644 (file)
--- 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