Fixed conflicts from merge

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

diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
index 6e7f82d8d3bc95affd87e195d5c8ff1f80c81308..241be9c68b2ff9518a39fb0bdb5b52616ea3cdd2 100644 (file)
--- a/man/man8/Makefile.am
+++ b/man/man8/Makefile.am
@@ -9,10 +9,21 @@ SUFFIXES = .tmpl .
            -e s@:BINDIR:@${bindir}@ \
            -e s@:ETCDIR:@${pkgconfdir}@ \
            -e s@:LIBDIR:@${libdir}@ \
-           <$^ >$@
+           -e s@:LIBEXECDIR:@${libexecdir}@ \
+           -e s@:NETATALK_VERSION:@${NETATALK_VERSION}@ \
+           <$< >$@
 
-man_MANS = afpd.8 atalkd.8 pap.8 papd.8 papstatus.8 psf.8
+NONGENERATED_MANS = timelord.8
+GENERATED_MANS    = afpd.8 cnid_dbd.8 cnid_metad.8
+TEMPLATE_FILES    = afpd.8.tmpl cnid_dbd.8.tmpl cnid_metad.8.tmpl
 
-CLEANFILES = afpd.8 atalkd.8 pap.8 papd.8 papstatus.8 psf.8
+if USE_APPLETALK
+GENERATED_MANS += atalkd.8 papd.8 papstatus.8 psf.8
+TEMPLATE_FILES += atalkd.8.tmpl papd.8.tmpl papstatus.8.tmpl psf.8.tmpl
+endif
 
-EXTRA_DIST = $(man_MANS)
+man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
+
+CLEANFILES = $(GENERATED_MANS)
+
+EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)