client: fix segfault when displaying some information

[thirdparty/lldpd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c7a2721ac8e478c9d9666d3b84d653d505975d46..78978d054e1615b70d8598b8f1ad6e98782d9bfa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,18 +2,23 @@ include doxygen.am
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS      = src/compat src src/daemon src/lib src/client tests
-EXTRA_DIST   = $(DX_CONFIG) include get-version
+SUBDIRS      = src/compat src src/daemon src/lib src/client tests osx
+EXTRA_DIST   = $(DX_CONFIG) include get-version autogen.sh
 DIST_SUBDIRS = $(SUBDIRS) libevent
 DISTCLEANFILES = ChangeLog
 
-dist_doc_DATA = README.md NEWS
+if HOST_OS_LINUX
+DIST_SUBDIRS += libnl
+endif
+
+dist_doc_DATA = README.md NEWS CONTRIBUTE.md
+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 | grep -E '^[0-9]+(\.[0-9]+){1,}$$' | sort -rn); 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')]:" ; \
@@ -30,3 +35,12 @@ dist-hook:
        echo $(VERSION) > $(distdir)/.dist-version
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
+
+# systemd and launchd files are not installed in the prefix, don't
+# request them for distcheck
+DISTCHECK_CONFIGURE_FLAGS = $(CONFIGURE_ARGS) \
+        --with-sysusersdir=no \
+        --with-systemdsystemunitdir=no \
+       --with-launchddaemonsdir=no \
+       --with-apparmordir=no
+