Merge branch 'collectd-4.2' into collectd-4.3

[collectd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d173ee70b0bd9698087dc2cfd3cd460dceed1343..b52b0e9309da9fe889237f70034039e231b18928 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,10 @@
-SUBDIRS = libltdl src
-INCLUDES = $(LTDLINCL)
+SUBDIRS = libltdl src bindings
 
-EXTRA_DIST = collectd.spec contrib debian
+INCLUDES = $(LTDLINCL)
 
-dist-hook:
-       find $(distdir) -type d -name '.svn' | xargs rm -rf
+EXTRA_DIST = contrib version-gen.sh
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
-       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+       $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log