Merge remote-tracking branch 'origin/branch-netatalk-3-1'

[netatalk.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 15cf32b5099d3663024211278639c478e2f1cc57..d52633f7737b9e2b30994fdd9c1acee4df2aadff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,19 @@
 # Makefile.am for top level of netatalk package
 
-SUBDIRS = libatalk bin config etc man contrib distrib include sys doc macros
+if USE_BUILTIN_LIBEVENT
+SUBDIRS = libevent include libatalk bin config etc contrib distrib doc man macros test
+else
+SUBDIRS = include libatalk bin config etc contrib distrib doc man macros test
+endif
 
-EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING ChangeLog \
-       TODO VERSION services.atalk
+EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION abigen.sh
 
 ACLOCAL_AMFLAGS = -I macros
+AUTOMAKE_OPTIONS = foreign
+
+if RUN_LDCONFIG
+install-exec-hook:
+       @printf "Running ldconfig to ensure libraries installed in system library directories are added to the dynamic linker cache ... "
+       @-@NETA_LDCONFIG@
+       @printf "done\n"
+endif