Merge remote-tracking branch 'github/pr/1961' into collectd-5.5

[collectd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9a96eb27c8594f65ae0079f6bbe48e74a4e0faaa..b79ea1cabfbdc562cfcd46983771b1351d6a5d23 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,23 @@
-SUBDIRS = libltdl src bindings
+ACLOCAL_AMFLAGS = -I libltdl/m4
 
-INCLUDES = $(LTDLINCL)
+SUBDIRS =
 
-EXTRA_DIST = contrib version-gen.sh
+if BUILD_INCLUDED_LTDL
+SUBDIRS += libltdl
+endif
+
+SUBDIRS += src bindings .
 
-dist-hook:
-       find $(distdir) -type d -name '.svn' | xargs rm -rf
+AM_CPPFLAGS = $(LTDLINCL)
+
+EXTRA_DIST = contrib version-gen.sh
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
+       $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
+
+maintainer-clean-local:
+       -rm -f -r libltdl
+       -rm -f INSTALL
+       -rm -f aclocal.m4