Merge from branch-2-1

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 001affa9ca0a6f15732bb0621741e2a3eec2817a..4817238a3be6ea7ab06907787dcfebe7bedff6d2 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,8 +3,19 @@
 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
@@ -20,10 +31,6 @@ if USE_APPLETALK
 CONFFILES += atalkd.conf papd.conf
 endif
 
-OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
-EXTRA_DIST = $(CONFFILES) $(TMPLFILES) afp_ldap.conf
-CLEANFILES = $(GENFILES)
-
 pkgconfdir = @PKGCONFDIR@
 webminpath = @WEBMIN_PATH@
 webminuser = @WEBMIN_USER@