distcheck fixes

diff --git a/Makefile.am b/Makefile.am
index 1a11f0bc179ccdbcfddbda3d1b13063521bdb473..9e4dc5a95281796ac4058428a830c80294a8c482 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,14 +6,9 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 EXTRA_DIST = \
        CHANGES LEGAL maketgz MITX.txt MPL-1.1.txt \
-       config-win32.h reconf packages/README \
-       packages/Linux/RPM/README \
-       packages/Linux/RPM/curl-ssl.spec.in \
-       packages/Linux/RPM/curl.spec.in \
-       packages/Linux/RPM/make_curl_rpm \
-       packages/Win32/README
+       config-win32.h reconf packages/README
 
-SUBDIRS = docs lib src include tests
+SUBDIRS = docs lib src include tests packages
 
 test:
        @(cd tests; make quiet-test)

diff --git a/configure.in b/configure.in
index 763f9194487680465572d6509ee7aedb3d37d0fc..f4a0a2a173ce11cba20619b9db0c4d21aeaed16a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -615,6 +615,10 @@ AC_OUTPUT( Makefile \
           src/Makefile \
            lib/Makefile \
            tests/Makefile \
+          packages/Makefile \
+          packages/Win32/Makefile \
+          packages/Linux/Makefile \
+          packages/Linux/RPM/Makefile \
           packages/Linux/RPM/curl.spec \
           packages/Linux/RPM/curl-ssl.spec )
 

diff --git a/packages/Linux/Makefile.am b/packages/Linux/Makefile.am
new file mode 100644 (file)
index 0000000..5753055
--- /dev/null
+++ b/packages/Linux/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = RPM

diff --git a/packages/Linux/RPM/Makefile.am b/packages/Linux/RPM/Makefile.am
new file mode 100644 (file)
index 0000000..5d46d87
--- /dev/null
+++ b/packages/Linux/RPM/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST = README curl-ssl.spec.in curl.spec.in make_curl_rpm
+

diff --git a/packages/Makefile.am b/packages/Makefile.am
new file mode 100644 (file)
index 0000000..21490bd
--- /dev/null
+++ b/packages/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = Win32 Linux

diff --git a/packages/Win32/Makefile.am b/packages/Win32/Makefile.am
new file mode 100644 (file)
index 0000000..952fde6
--- /dev/null
+++ b/packages/Win32/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = README

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