Merge 2-2

[netatalk.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b40b6d0c728a6cefa10701a3f6f10098095b412b..5ee6b85319979f0c1e7f18a6af8fa32497a0e4a3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,19 @@
 # Makefile.am for top level of netatalk package
 
-# libevent should be first
-SUBDIRS = libevent libatalk bin config etc man contrib distrib include doc macros test
+SUBDIRS = libatalk libevent bin config etc man contrib distrib include doc macros test
 
 EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION services.atalk
 
 ACLOCAL_AMFLAGS = -I macros
 AUTOMAKE_OPTIONS = foreign
 
+if USE_BUILTIN_LIBEVENT
+       SUBDIRS += libevent
+endif
+
+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