Merge with pekdon

1 files changed, 7 insertions, 2 deletions

diff --git a/Makefile.in b/Makefile.in
index 7033a27..6809d5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,9 +105,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+        cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
         cd $(top_builddir) \
           && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -276,6 +276,11 @@ distdir: $(DISTFILES)
         -rm -rf $(distdir)
         mkdir $(distdir)
         -chmod 777 $(distdir)
+        here=`cd $(top_builddir) && pwd`; \
+        top_distdir=`cd $(distdir) && pwd`; \
+        distdir=`cd $(distdir) && pwd`; \
+        cd $(top_srcdir) \
+          && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
         @for file in $(DISTFILES); do \
           d=$(srcdir); \
           if test -d $$d/$$file; then \