fix dist

diff --git a/dist-subd.am b/dist-subd.am
index d698c5379770a27553a21799ea6faf9f940ee75c..a735f9e84b9a2f3fca3de10966297c1d6b3be11f 100644 (file)
--- 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 6b476d5e8d9899195c7b1034071b3ab3a02e7213..a82b8c4ce4afb5fbce8ad09fa782807da2948907 100644 (file)
--- 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`