Merge master

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

diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
index c77b7d1064208ec4ccb7da83eb515306d9b2561e..52564afb6b3916de3408767103322e32e2a10ca5 100644 (file)
--- a/man/man1/Makefile.am
+++ b/man/man1/Makefile.am
@@ -9,36 +9,18 @@ SUFFIXES= .tmpl .
            -e s@:BINDIR:@${bindir}@ \
            -e s@:ETCDIR:@${pkgconfdir}@ \
            -e s@:LIBDIR:@${libdir}@ \
+           -e s@:DEFAULT_CNID_SCHEME:@${DEFAULT_CNID_SCHEME}@ \
            <$< >$@
 
-GENERATED_MANS = apple_cp.1 
-TEMPLATE_FILES = $(foreach f,$(GENERATED_MANS),$(f).tmpl)
-NONGENERATED_MANS      =       achfile.1  \
-                               acleandir.1 \
-                               aecho.1 \
-                               afile.1 \
+GENERATED_MANS = uniconv.1 asip-status.pl.1 afpldaptest.1
+TEMPLATE_FILES = uniconv.1.tmpl asip-status.pl.1.tmpl afpldaptest.1.tmpl
+
+NONGENERATED_MANS      =       ad.1 \
                                afppasswd.1 \
-                               getzones.1 \
-                               hqx2bin.1 \
-                               macbinary.1 \
-                               megatron.1 \
-                               nbp.1 \
-                               nbplkup.1 \
-                               nbprgstr.1 \
-                               nbpunrgstr.1 \
-                               netatalk-config.1 \
-                               pap.1 \
-                               papstatus.1 \
-                               psorder.1 \
-                               single2bin.1 \
-                               timeout.1 \
-                               unbin.1 \
-                               unhex.1 \
-                               unsingle.1
+                               apple_dump.1 \
+                               dbd.1 \
+                               netatalk-config.1
 
 man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
-
 CLEANFILES = $(GENERATED_MANS)
-
-EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)
-
+EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS) $(ATALK_MANS)