Fix merge conflicts

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index ab07e1134ffb7822389652be30c4cf3d36f2cabe..c05bdd0f1764fa5963919e256737a0cd0fff04d9 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -5,11 +5,16 @@ SUFFIXES = .tmpl .
 
 GENFILES = afpd.conf AppleVolumes.default
 TMPLFILES = afpd.conf.tmpl AppleVolumes.default.tmpl
-CONFFILES = AppleVolumes.system atalkd.conf netatalk.conf papd.conf
-if USE_NFSv4_ACLS
+CONFFILES = AppleVolumes.system netatalk.conf
+
+if HAVE_ACLS
 CONFFILES += afp_ldap.conf
 endif
 
+if USE_APPLETALK
+CONFFILES += atalkd.conf papd.conf
+endif
+
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 EXTRA_DIST = $(CONFFILES) $(TMPLFILES) afp_ldap.conf
 CLEANFILES = $(GENFILES)