Merge 2-1

[netatalk.git] / man / man5 / Makefile.am

diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am
index 3265d4be56f2f0a438decb50407fcbc6d64f6610..a382039eeae6ebfa7475aba6bb89d57ab5039139 100644 (file)
--- a/man/man5/Makefile.am
+++ b/man/man5/Makefile.am
@@ -17,17 +17,21 @@ GENERATED_MANS = AppleVolumes.default.5 \
        afpd.conf.5 \
        netatalk.conf.5 \
        afp_ldap.conf.5 \
-       afp_signature.conf.5
+       afp_signature.conf.5 \
+       afp_voluuid.conf.5
 
 TEMPLATE_FILES = AppleVolumes.default.5.tmpl \
        afpd.conf.5.tmpl \
        netatalk.conf.5.tmpl \
        afp_ldap.conf.5.tmpl \
-       afp_signature.conf.5.tmpl
+       afp_signature.conf.5.tmpl \
+       afp_voluuid.conf.5.tmpl
+
+ATALK_MANS = atalkd.conf.5.tmpl papd.conf.5.tmpl
 
 if USE_APPLETALK
 GENERATED_MANS += atalkd.conf.5 papd.conf.5
-TEMPLATE_FILES += atalkd.conf.5.tmpl papd.conf.5.tmpl
+TEMPLATE_FILES += $(ATALK_MANS)
 endif
 
 NONGENERATED_MANS = AppleVolumes.5 AppleVolumes.system.5
@@ -36,4 +40,4 @@ man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
 
 CLEANFILES = $(GENERATED_MANS)
 
-EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)
+EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS) $(ATALK_MANS)