Merge pull request #391 from Polynomial-C/1.0.5-gentoo_seccomp

[thirdparty/lldpd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6279fc63c97ec7f38cd5ce5d4aac266c28c61b73..80abf73ec849ee8acb2a1a9c06c2b9cedc96c8ff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,17 +7,17 @@ EXTRA_DIST   = $(DX_CONFIG) include get-version autogen.sh
 DIST_SUBDIRS = $(SUBDIRS) libevent
 DISTCLEANFILES = ChangeLog
 
-dist_doc_DATA = README.md NEWS CONTRIBUTE.md
+dist_doc_DATA = README.md NEWS CONTRIBUTE.md LICENSE
 doc_DATA = ChangeLog
 
 __force-changelog-generation:
 ChangeLog: __force-changelog-generation
-       $(AM_V_GEN)if test -d $(top_srcdir)/.git; then \
+       $(AM_V_GEN)if test -e $(top_srcdir)/.git; then \
                prev=$$(git describe --tags --always --match '[0-9]*' 2> /dev/null) ; \
-               for tag in $$(git tag | $(EGREP) '^[0-9]+(\.[0-9]+){1,}$$' | sort -rV); do \
+               for tag in $$(git tag | $(EGREP) '^[0-9]+(\.[0-9]+){1,}$$' | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr); do \
                        if [ x"$$prev" = x ]; then prev=$$tag ; fi ; \
                        if [ x"$$prev" = x"$$tag" ]; then continue; fi ; \
-                       echo "$$prev [$$(git log $$prev -1 --pretty=format:'%ai')]:" ; \
+                       echo "$$prev [$$(git log --no-merges $$prev -1 --pretty=format:'%ai')]:" ; \
                        echo "" ; \
                        git log --pretty=' - [%h] %s (%an)' $$tag..$$prev ; \
                        echo "" ; \
@@ -34,7 +34,11 @@ MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 # systemd and launchd files are not installed in the prefix, don't
 # request them for distcheck
-DISTCHECK_CONFIGURE_FLAGS = \
+DISTCHECK_CONFIGURE_FLAGS = $(CONFIGURE_ARGS) \
         --with-sysusersdir=no \
         --with-systemdsystemunitdir=no \
-       --with-launchddaemonsdir=no
+       --with-launchddaemonsdir=no \
+       --with-apparmordir=no \
+       --sysconfdir='$$(prefix)/etc'
+
+