Merge branch-2-1

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index a9af018d62aa9eac60b8898d038bfd787d393ad1..ce0fb96e2d3c02f02620a88f843082299a31d6c6 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,22 +3,33 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-GENFILES = afpd.conf AppleVolumes.default
 TMPLFILES = afpd.conf.tmpl AppleVolumes.default.tmpl
+GENFILES = afpd.conf AppleVolumes.default
+CLEANFILES = $(GENFILES)
+EXTRA_DIST = \
+       AppleVolumes.default.tmpl \
+       AppleVolumes.system \
+       afp_ldap.conf \
+       afpd.conf.tmpl \
+       atalkd.conf \
+       netatalk.conf \
+       papd.conf
+
+OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
 if USE_DEBIAN
-CONFFILES = AppleVolumes.system atalkd.conf papd.conf
+CONFFILES = AppleVolumes.system
 else
-CONFFILES = AppleVolumes.system atalkd.conf papd.conf netatalk.conf
+CONFFILES = AppleVolumes.system netatalk.conf
 endif
 
-if USE_NFSv4_ACLS
+if HAVE_ACLS
 CONFFILES += afp_ldap.conf
 endif
 
-OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
-EXTRA_DIST = $(CONFFILES) $(TMPLFILES) afp_ldap.conf
-CLEANFILES = $(GENFILES)
+if USE_APPLETALK
+CONFFILES += atalkd.conf papd.conf
+endif
 
 pkgconfdir = @PKGCONFDIR@
 webminpath = @WEBMIN_PATH@