Merge remote branch 'origin/collectd-4.9' into collectd-4.9

[collectd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f8279e3ed6273b37a0384bd342c7a8a90289e97d..9e3feac406f152d79e8a0df5ff3fc47367137012 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,12 @@
-AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I libltdl/m4
 
-SUBDIRS = src
+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)$(localstatedir)/log