From e50887a876786e5cd0185ef5e42ddfdd4da63d69 Mon Sep 17 00:00:00 2001
From: Frank Lahm <franklahm@googlemail.com>
Date: Mon, 8 Nov 2010 13:48:07 +0100
Subject: [PATCH] Ensure Appletalk manpages and config files are distributed

---
 NEWS                 |  1 +
 config/Makefile.am   | 17 ++++++++++++-----
 man/man1/Makefile.am | 12 +++++-------
 man/man3/Makefile.am |  6 ++++--
 man/man4/Makefile.am |  6 ++++--
 man/man5/Makefile.am |  6 ++++--
 man/man8/Makefile.am |  5 +++--
 7 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/NEWS b/NEWS
index 1a30f5d9..692881e1 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Changes in 2.2alpha2
 ====================
 
 * FIX: afpd: fix compilation error when ACL support is not available
+* FIX: Ensure Appletalk manpages and config files are distributed
 
 Changes in 2.2alpha1
 ====================
diff --git a/config/Makefile.am b/config/Makefile.am
index 001affa9..4817238a 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,8 +3,19 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-GENFILES = afpd.conf AppleVolumes.default
 TMPLFILES = afpd.conf.tmpl AppleVolumes.default.tmpl
+GENFILES = afpd.conf AppleVolumes.default
+CLEANFILES = $(GENFILES)
+EXTRA_DIST = \
+	AppleVolumes.default.tmpl \
+	AppleVolumes.system \
+	afp_ldap.conf \
+	afpd.conf.tmpl \
+	atalkd.conf \
+	netatalk.conf \
+	papd.conf
+
+OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
 if USE_DEBIAN
 CONFFILES = AppleVolumes.system
@@ -20,10 +31,6 @@ if USE_APPLETALK
 CONFFILES += atalkd.conf papd.conf
 endif
 
-OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
-EXTRA_DIST = $(CONFFILES) $(TMPLFILES) afp_ldap.conf
-CLEANFILES = $(GENFILES)
-
 pkgconfdir = @PKGCONFDIR@
 webminpath = @WEBMIN_PATH@
 webminuser = @WEBMIN_USER@
diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
index d15cfb96..b3e6bdb5 100644
--- a/man/man1/Makefile.am
+++ b/man/man1/Makefile.am
@@ -26,9 +26,7 @@ NONGENERATED_MANS	=	ad.1 \
 				unbin.1 \
 				unhex.1 \
 				unsingle.1
-
-if USE_APPLETALK
-NONGENERATED_MANS += aecho.1 \
+ATALK_MANS = aecho.1 \
 				getzones.1 \
 				nbp.1 \
 				nbplkup.1 \
@@ -37,11 +35,11 @@ NONGENERATED_MANS += aecho.1 \
 				pap.1 \
 				papstatus.1 \
 				psorder.1
+
+if USE_APPLETALK
+NONGENERATED_MANS += $(ATALK_MANS)
 endif
 
 man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
-
 CLEANFILES = $(GENERATED_MANS)
-
-EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)
-
+EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS) $(ATALK_MANS)
diff --git a/man/man3/Makefile.am b/man/man3/Makefile.am
index 4212f267..198f9772 100644
--- a/man/man3/Makefile.am
+++ b/man/man3/Makefile.am
@@ -1,7 +1,9 @@
 # Makefile.am for man/man3
 
+ATALK_MANS = atalk_aton.3 nbp_name.3
+
 if USE_APPLETALK
-man_MANS = atalk_aton.3 nbp_name.3
+man_MANS = $(ATALK_MANS)
 endif
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(ATALK_MANS)
diff --git a/man/man4/Makefile.am b/man/man4/Makefile.am
index 73e1610e..d0295d41 100644
--- a/man/man4/Makefile.am
+++ b/man/man4/Makefile.am
@@ -1,7 +1,9 @@
 # Makefile.am for man/man4/
 
+ATALK_MANS = atalk.4
+
 if USE_APPLETALK
-man_MANS = atalk.4
+man_MANS = $(ATALK_MANS)
 endif
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(ATALK_MANS)
diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am
index 3265d4be..e3d258c7 100644
--- a/man/man5/Makefile.am
+++ b/man/man5/Makefile.am
@@ -25,9 +25,11 @@ TEMPLATE_FILES = AppleVolumes.default.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 += atalkd.conf.5.tmpl papd.conf.5.tmpl
+TEMPLATE_FILES += $(ATALK_MANS)
 endif
 
 NONGENERATED_MANS = AppleVolumes.5 AppleVolumes.system.5
@@ -36,4 +38,4 @@ man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
 
 CLEANFILES = $(GENERATED_MANS)
 
-EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)
+EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS) $(ATALK_MANS)
diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
index 241be9c6..26273d43 100644
--- a/man/man8/Makefile.am
+++ b/man/man8/Makefile.am
@@ -16,14 +16,15 @@ SUFFIXES = .tmpl .
 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
+ATALK_MANS        = atalkd.8.tmpl papd.8.tmpl papstatus.8.tmpl psf.8.tmpl
 
 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
+TEMPLATE_FILES += $(ATALK_MANS)
 endif
 
 man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
 
 CLEANFILES = $(GENERATED_MANS)
 
-EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)
+EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS) $(ATALK_MANS)
-- 
2.39.2