Fix merge conflicts

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 4fbf3441ec6644f11b71bc2810deac9e28ace8da..c05bdd0f1764fa5963919e256737a0cd0fff04d9 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,17 +1,22 @@
 ## Makefile.am for config/
 
 SUBDIRS = pam
-
 SUFFIXES = .tmpl .
 
 GENFILES = afpd.conf AppleVolumes.default
 TMPLFILES = afpd.conf.tmpl AppleVolumes.default.tmpl
-CONFFILES = AppleVolumes.system \
-       atalkd.conf netatalk.conf papd.conf
-OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
+CONFFILES = AppleVolumes.system netatalk.conf
+
+if HAVE_ACLS
+CONFFILES += afp_ldap.conf
+endif
 
-EXTRA_DIST = $(CONFFILES) $(TMPLFILES)
+if USE_APPLETALK
+CONFFILES += atalkd.conf papd.conf
+endif
 
+OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
+EXTRA_DIST = $(CONFFILES) $(TMPLFILES) afp_ldap.conf
 CLEANFILES = $(GENFILES)
 
 pkgconfdir = @PKGCONFDIR@
@@ -36,6 +41,15 @@ webminport = @WEBMIN_PORT@
 # install configuration files
 #
 
+install-data-local: install-config-files install-webmin
+
+uninstall-local:
+       for f in $(CONFFILES) $(GENFILES); do \
+               echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
+               rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
+       done
+
+
 install-config-files: $(CONFFILES) $(GENFILES)
        $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
        for f in $(CONFFILES) $(GENFILES); do \