Merge master

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

diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am
index e3d258c74e04e3e75b877a3206096ba7b61e602b..2f7ec5b6cc091822761943fd771a8a71d2714f61 100644 (file)
--- a/man/man5/Makefile.am
+++ b/man/man5/Makefile.am
@@ -17,20 +17,15 @@ 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
-
-ATALK_MANS = atalkd.conf.5.tmpl papd.conf.5.tmpl
-
-if USE_APPLETALK
-GENERATED_MANS += atalkd.conf.5 papd.conf.5
-TEMPLATE_FILES += $(ATALK_MANS)
-endif
+       afp_signature.conf.5.tmpl \
+       afp_voluuid.conf.5.tmpl
 
 NONGENERATED_MANS = AppleVolumes.5 AppleVolumes.system.5
 
@@ -38,4 +33,4 @@ man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
 
 CLEANFILES = $(GENERATED_MANS)
 
-EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS) $(ATALK_MANS)
+EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)