Remove ChangeLog from make dist, debian-pdns/rules

diff --git a/Makefile.am b/Makefile.am
index 0119fc89eecb9e3c4e733ace9f8e8f70e90cf1e5..953e965326bd039d50a6c2a8f1e79dd40b9d65ec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=modules codedocs @programdescend@
 DIST_SUBDIRS=modules codedocs pdns pdns/ext/rapidjson
-EXTRA_DIST=TODO README HACKING INSTALL ChangeLog debian-pdns/* pdns.spec  \
+EXTRA_DIST=TODO README HACKING INSTALL debian-pdns/* pdns.spec  \
 codedocs/Makefile codedocs/doxygen.conf contrib/powerdns.solaris.init.d \
 contrib/systemd-pdns.service contrib/systemd-pdns-recursor.service \
 bootstrap build-scripts/semistaticg++

diff --git a/configure.ac b/configure.ac
index ae989b5b75dd9bdd012b99da720593984d370a22..14985740ef7495eecda7d3d300ed716aa4103224 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([pdns], [git])
 dnl AC_SUBST([DIST_HOST], [TO_BE_PATCHED])
 dnl End patch area.
 AC_CONFIG_SRCDIR([pdns/receiver.cc])
-AM_INIT_AUTOMAKE([tar-ustar -Wno-portability])
+AM_INIT_AUTOMAKE([foreign tar-ustar -Wno-portability])
 AC_CANONICAL_HOST
 LT_INIT
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/debian-pdns/rules b/debian-pdns/rules
index fcfe29269accf17ad8c1af97834084dbc01a4927..daf06d7e3a6766e3da6b071ce3680c59506aeaef 100755 (executable)
--- a/debian-pdns/rules
+++ b/debian-pdns/rules
@@ -19,8 +19,6 @@ binary-doc:
 
        install -d -m 755 -o root -g root \
                "$(tmpdir)"/usr/share/doc/pdns-doc
-       install -p -m 644 -o root -g root ChangeLog \
-                       "$(tmpdir)"/usr/share/doc/pdns-doc/changelog
        install -p -m 644 -o root -g root debian-pdns/changelog \
                        "$(tmpdir)"/usr/share/doc/pdns-doc/changelog.Debian
        gzip -9 "$(tmpdir)"/usr/share/doc/pdns-doc/*
@@ -97,8 +95,6 @@ binary-main-prepare:
 
        install -d -m 755 -o root -g root \
                "$(tmpdir)"/usr/share/doc/pdns
-       install -p -m 644 -o root -g root ChangeLog \
-                       "$(tmpdir)"/usr/share/doc/pdns/changelog
        install -p -m 644 -o root -g root debian-pdns/changelog \
                        "$(tmpdir)"/usr/share/doc/pdns/changelog.Debian
        gzip -9 "$(tmpdir)"/usr/share/doc/pdns/c*