Build system: Do not include Makefile and src/config.h in distribution tarball

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile.in b/Makefile.in
index 7f6592407106bcffadf4fac5844cd75e7700c3ab..4e8f7ef57efea3a1c0d500e3e7d1d223542134ca 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,7 @@ clean-here mostlyclean-here:
                rm -rf dist_tmp
 
 distclean-here maintainer-clean-here:  clean-here
-               rm -f settings.make config.h config.cache config.log config.status
+       rm -f settings.make config.cache config.log config.status Makefile
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM_FLAGS=-s

diff --git a/changelog b/changelog
index 2f7a15379d89ba58677571ae46acb3e7cfbfca5a..959ac1d83fb2d8d35f264e5c33fcfabbca7ef784 100644 (file)
--- a/changelog
+++ b/changelog
@@ -19,6 +19,7 @@ adns (1.5~~) UPSTREAM; urgency=low
   Build system fixes and improvements:
   * `make clean' removes the pipes.
   * Work around bugs in make (Debian #4073, #756123) affecting regress.
+  * Do not include Makefile and src/config.h in distribution tarball.
 
   Regression test debugging improvements:
   * Provide gdbwrap convenience script.

diff --git a/settings.make.in b/settings.make.in
index 4fcb0332fb8925004bc82ae9330a08f4711b48d7..abab1fdadc069db3168681fe8a6e18f3015c4948 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -67,7 +67,7 @@ clean mostlyclean:
                rm -f *.o *.tmp* *.so *.so.* pipe.*
 
 distclean:             clean
-               rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile
+               rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile config.h
 
 distprep:              $(AUTOCSRCS) $(AUTOCHDRS)