'make distcheck' works now

diff --git a/Makefile.am b/Makefile.am
index 9e4dc5a95281796ac4058428a830c80294a8c482..415bde30cd1aebbdefcd7c7d83daee2ad2fbc4e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,10 @@ EXTRA_DIST = \
 
 SUBDIRS = docs lib src include tests packages
 
+# create a root makefile in the distribution:
+dist-hook:
+       cp Makefile.dist $(distdir)/Makefile
+
 test:
        @(cd tests; make quiet-test)
 

diff --git a/configure.in b/configure.in
index f4a0a2a173ce11cba20619b9db0c4d21aeaed16a..c6de40711361526b0df2af9905c7a03118fb484c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -615,6 +615,7 @@ AC_OUTPUT( Makefile \
           src/Makefile \
            lib/Makefile \
            tests/Makefile \
+           tests/data/Makefile \
           packages/Makefile \
           packages/Win32/Makefile \
           packages/Linux/Makefile \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa37e30399ffd0e25404485c875db3c386abbc70..f2a917ae501493145544f34b18b8ed2ad10721cb 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,6 @@
-EXTRA_DIST = data ftpserver.pl httpserver.pl runtests.pl
+EXTRA_DIST = ftpserver.pl httpserver.pl runtests.pl
+
+SUBDIRS = data
 
 all:
 install: