Fixed conflicts from merge

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

diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am
index a1e28886df45aa60cca4ce65529e79ca207da133..3265d4be56f2f0a438decb50407fcbc6d64f6610 100644 (file)
--- a/man/man5/Makefile.am
+++ b/man/man5/Makefile.am
@@ -13,13 +13,22 @@ SUFFIXES = .tmpl .
            -e "s@:COMPILED_BACKENDS:@${compiled_backends}@g" \
            <$< >$@
 
-GENERATED_MANS = AppleVolumes.default.5 afpd.conf.5 \
-       atalkd.conf.5 netatalk.conf.5 papd.conf.5 \
-       afp_ldap.conf.5 afp_signature.conf.5
-
-TEMPLATE_FILES = AppleVolumes.default.5.tmpl afpd.conf.5.tmpl \
-       atalkd.conf.5.tmpl netatalk.conf.5.tmpl papd.conf.5.tmpl \
-       afp_ldap.conf.5.tmpl afp_signature.conf.5.tmpl
+GENERATED_MANS = AppleVolumes.default.5 \
+       afpd.conf.5 \
+       netatalk.conf.5 \
+       afp_ldap.conf.5 \
+       afp_signature.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
+
+if USE_APPLETALK
+GENERATED_MANS += atalkd.conf.5 papd.conf.5
+TEMPLATE_FILES += atalkd.conf.5.tmpl papd.conf.5.tmpl
+endif
 
 NONGENERATED_MANS = AppleVolumes.5 AppleVolumes.system.5