diff --git a/doc/Makefile.am b/doc/Makefile.am
index d8e2be1c..2869dbb6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,36 +28,34 @@ XML_MANPAGES = \
${top_srcdir}/doc/manpages/man8/netatalk.8.xml
MAN_MANPAGES = \
- ${top_builddir}/man/man1/ad.1 \
- ${top_builddir}/man/man1/afpldaptest.1 \
- ${top_builddir}/man/man1/afppasswd.1 \
- ${top_builddir}/man/man1/afpstats.1 \
- ${top_builddir}/man/man1/apple_dump.1 \
- ${top_builddir}/man/man1/asip-status.pl.1 \
- ${top_builddir}/man/man1/dbd.1 \
- ${top_builddir}/man/man1/macusers.1 \
- ${top_builddir}/man/man1/megatron.1 \
- ${top_builddir}/man/man1/netatalk-config.1 \
- ${top_builddir}/man/man1/uniconv.1 \
- ${top_builddir}/man/man5/afp_signature.conf.5 \
- ${top_builddir}/man/man5/afp_voluuid.conf.5 \
- ${top_builddir}/man/man5/afp.conf.5 \
- ${top_builddir}/man/man5/extmap.conf.5 \
- ${top_builddir}/man/man8/afpd.8 \
- ${top_builddir}/man/man8/cnid_dbd.8 \
- ${top_builddir}/man/man8/cnid_metad.8 \
- ${top_builddir}/man/man8/netatalk.8
+ ${top_builddir}/man/man1/ad.1.in \
+ ${top_builddir}/man/man1/afpldaptest.1.in \
+ ${top_builddir}/man/man1/afppasswd.1.in \
+ ${top_builddir}/man/man1/afpstats.1.in \
+ ${top_builddir}/man/man1/apple_dump.1.in \
+ ${top_builddir}/man/man1/asip-status.pl.1.in \
+ ${top_builddir}/man/man1/dbd.1.in \
+ ${top_builddir}/man/man1/macusers.1.in \
+ ${top_builddir}/man/man1/megatron.1.in \
+ ${top_builddir}/man/man1/netatalk-config.1.in \
+ ${top_builddir}/man/man1/uniconv.1.in \
+ ${top_builddir}/man/man5/afp_signature.conf.5.in \
+ ${top_builddir}/man/man5/afp_voluuid.conf.5.in \
+ ${top_builddir}/man/man5/afp.conf.5.in \
+ ${top_builddir}/man/man5/extmap.conf.5.in \
+ ${top_builddir}/man/man8/afpd.8.in \
+ ${top_builddir}/man/man8/cnid_dbd.8.in \
+ ${top_builddir}/man/man8/cnid_metad.8.in \
+ ${top_builddir}/man/man8/netatalk.8.in
if HAVE_XSLTPROC
${top_srcdir}/man/man1/%.1.in : $(MAN_STYLESHEET) ${top_srcdir}/doc/manpages/man1/%.1.xml
- @xsltproc -o $(top_builddir)/man/man1/ $(MAN_STYLESHEET) $<
- @$(SED) -i -e "s@:NETATALK_VERSION:@Netatalk $(VERSION)@g" $@
+ @xsltproc -o $(top_builddir)/man/man1/ $(MAN_STYLESHEET) $<
+ mv $% $@.in
${top_srcdir}/man/man5/%.8.in : $(MAN_STYLESHEET) ${top_srcdir}/doc/manpages/man5/%.5.xml
- @xsltproc -o $(top_builddir)/man/man5/ $(MAN_STYLESHEET) $<
- @$(SED) -i -e "s@:NETATALK_VERSION:@Netatalk $(VERSION)@g" $@
+ @xsltproc -o $(top_builddir)/man/man5/ $(MAN_STYLESHEET) $<
${top_srcdir}/man/man8/%.8.in : $(MAN_STYLESHEET) ${top_srcdir}/doc/manpages/man8/%.8.xml
- @xsltproc -o $(top_builddir)/man/man8/ $(MAN_STYLESHEET) $<
- @$(SED) -i -e "s@:NETATALK_VERSION:@Netatalk $(VERSION)@g" $@
+ @xsltproc -o $(top_builddir)/man/man8/ $(MAN_STYLESHEET) $<
all-local: $(MAN_MANPAGES)
diff --git a/doc/manpages/man1/ad.1.xml b/doc/manpages/man1/ad.1.xml
index 3163d067..b6a9f551 100644
--- a/doc/manpages/man1/ad.1.xml
+++ b/doc/manpages/man1/ad.1.xml
@@ -7,7 +7,7 @@
02 Sep 2011
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
diff --git a/doc/manpages/man1/afpldaptest.1.xml b/doc/manpages/man1/afpldaptest.1.xml
index 52ec6d33..a7e73cdd 100644
--- a/doc/manpages/man1/afpldaptest.1.xml
+++ b/doc/manpages/man1/afpldaptest.1.xml
@@ -7,7 +7,7 @@
22 Mar 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -43,7 +43,7 @@
DESCRIPTION
afpldaptest is a simple command to syntactically
- check ldap parameters in :ETCDIR:/afp.conf.
+ check ldap parameters in @pkgconfdir@/afp.conf.
diff --git a/doc/manpages/man1/afppasswd.1.xml b/doc/manpages/man1/afppasswd.1.xml
index ccd5ee6d..e67727fd 100644
--- a/doc/manpages/man1/afppasswd.1.xml
+++ b/doc/manpages/man1/afppasswd.1.xml
@@ -7,7 +7,7 @@
22 Mar 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
diff --git a/doc/manpages/man1/afpstats.1.xml b/doc/manpages/man1/afpstats.1.xml
index b1ab94f2..c2e97990 100644
--- a/doc/manpages/man1/afpstats.1.xml
+++ b/doc/manpages/man1/afpstats.1.xml
@@ -7,7 +7,7 @@
24 Mar 2013
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -36,7 +36,7 @@
"afpd -V".
"" must be set in
- :ETCDIR:/afp.conf.
+ @pkgconfdir@/afp.conf.
diff --git a/doc/manpages/man1/apple_dump.1.xml b/doc/manpages/man1/apple_dump.1.xml
index 1723a30c..2457d1d1 100644
--- a/doc/manpages/man1/apple_dump.1.xml
+++ b/doc/manpages/man1/apple_dump.1.xml
@@ -7,7 +7,7 @@
16 Jul 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
diff --git a/doc/manpages/man1/asip-status.pl.1.xml b/doc/manpages/man1/asip-status.pl.1.xml
index d8d5b8dd..859b063f 100644
--- a/doc/manpages/man1/asip-status.pl.1.xml
+++ b/doc/manpages/man1/asip-status.pl.1.xml
@@ -7,7 +7,7 @@
24 Jul 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
diff --git a/doc/manpages/man1/dbd.1.xml b/doc/manpages/man1/dbd.1.xml
index b3043f3f..36b7aba0 100644
--- a/doc/manpages/man1/dbd.1.xml
+++ b/doc/manpages/man1/dbd.1.xml
@@ -7,7 +7,7 @@
28 Dec 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
diff --git a/doc/manpages/man1/macusers.1.xml b/doc/manpages/man1/macusers.1.xml
index 6f0abb19..5cfee6f5 100644
--- a/doc/manpages/man1/macusers.1.xml
+++ b/doc/manpages/man1/macusers.1.xml
@@ -7,7 +7,7 @@
13 Oct 2011
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
diff --git a/doc/manpages/man1/megatron.1.xml b/doc/manpages/man1/megatron.1.xml
index 34c3d0cc..20b64059 100644
--- a/doc/manpages/man1/megatron.1.xml
+++ b/doc/manpages/man1/megatron.1.xml
@@ -7,7 +7,7 @@
02 Sep 2011
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
diff --git a/doc/manpages/man1/netatalk-config.1.xml b/doc/manpages/man1/netatalk-config.1.xml
index 391ae5ce..69da13f0 100644
--- a/doc/manpages/man1/netatalk-config.1.xml
+++ b/doc/manpages/man1/netatalk-config.1.xml
@@ -7,7 +7,7 @@
09 June 2001
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
The Netatalk Project
diff --git a/doc/manpages/man1/uniconv.1.xml b/doc/manpages/man1/uniconv.1.xml
index 8f2d84c1..d563c289 100644
--- a/doc/manpages/man1/uniconv.1.xml
+++ b/doc/manpages/man1/uniconv.1.xml
@@ -8,7 +8,7 @@
19 Jan 2013
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -53,7 +53,7 @@
CNID backend used on this volume, usually cdb or dbd. Should
match the backend selected with afpd for this volume. If not
- specified, the default CNID backend ":DEFAULT_CNID_SCHEME:" is
+ specified, the default CNID backend "@DEFAULT_CNID_SCHEME@" is
used
diff --git a/doc/manpages/man5/afp.conf.5.xml b/doc/manpages/man5/afp.conf.5.xml
index 44b5a468..f5a5510f 100644
--- a/doc/manpages/man5/afp.conf.5.xml
+++ b/doc/manpages/man5/afp.conf.5.xml
@@ -7,7 +7,7 @@
30 Apr 2013
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -383,7 +383,7 @@
allows Random Number and Two-Way Random Number
Exchange for authentication (requires a separate file
- containing the passwords, either :ETCDIR:/afppasswd file or
+ containing the passwords, either @pkgconfdir@/afppasswd file or
the one specified via "". See
afppasswd
@@ -428,7 +428,7 @@
Sets the default path for UAMs for this server (default is
- :LIBDIR:/netatalk).
+ @libdir@/netatalk).
@@ -509,7 +509,7 @@
Sets the path to the Randnum UAM passwd file for this server
- (default is :ETCDIR:/afppasswd).
+ (default is @pkgconfdir@/afppasswd).
@@ -822,7 +822,7 @@
Sets the path to the file which defines file extension
- type/creator mappings. (default is :ETCDIR:/extmap.conf).
+ type/creator mappings. (default is @pkgconfdir@/extmap.conf).
@@ -878,7 +878,7 @@
characters. This option is useful for clustered environments, to
provide fault isolation etc. By default, afpd generate signature
and saving it to
- :STATEDIR:/netatalk/afp_signature.conf
+ @localstatedir@/netatalk/afp_signature.conf
automatically (based on random number). See also
asip-status.pl(1).
@@ -904,7 +904,7 @@
Sets the database information to be stored in path. You have
to specify a writable location, even if the volume is read only.
The default is
- :STATEDIR:/netatalk/CNID/.
+ @localstatedir@/netatalk/CNID/.
@@ -1446,8 +1446,8 @@
set the CNID backend to be used for the volume, default is
- [:DEFAULT_CNID_SCHEME:] available schemes:
- [:COMPILED_BACKENDS:]
+ [@DEFAULT_CNID_SCHEME@] available schemes:
+ [@compiled_backends@]
@@ -1821,7 +1821,7 @@
not by name. Netatalk needs a way to store these ID's in a persistent way,
to achieve this several different CNID backends are available. The CNID
Databases are by default located in the
- :STATEDIR:/netatalk/CNID/(volumename)/.AppleDB/
+ @localstatedir@/netatalk/CNID/(volumename)/.AppleDB/
directory.
diff --git a/doc/manpages/man5/afp_signature.conf.5.xml b/doc/manpages/man5/afp_signature.conf.5.xml
index a5ed793a..287b6d71 100644
--- a/doc/manpages/man5/afp_signature.conf.5.xml
+++ b/doc/manpages/man5/afp_signature.conf.5.xml
@@ -8,7 +8,7 @@
23 Mar 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -23,7 +23,7 @@
Description
- :STATEDIR:/netatalk/afp_signature.conf is the
+ @localstatedir@/netatalk/afp_signature.conf is the
configuration file used by afpd to specify
server signature automagically. The configuration lines are
composed like:
diff --git a/doc/manpages/man5/afp_voluuid.conf.5.xml b/doc/manpages/man5/afp_voluuid.conf.5.xml
index b91614e0..0956b474 100644
--- a/doc/manpages/man5/afp_voluuid.conf.5.xml
+++ b/doc/manpages/man5/afp_voluuid.conf.5.xml
@@ -8,7 +8,7 @@
23 Mar 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -23,7 +23,7 @@
Description
- :STATEDIR:/netatalk/afp_voluuid.conf is the
+ @localstatedir@/netatalk/afp_voluuid.conf is the
configuration file used by afpd to specify
UUID of Time Machine volume automagically. The configuration
lines are composed like:
diff --git a/doc/manpages/man5/extmap.conf.5.xml b/doc/manpages/man5/extmap.conf.5.xml
index f9802f32..4265928d 100644
--- a/doc/manpages/man5/extmap.conf.5.xml
+++ b/doc/manpages/man5/extmap.conf.5.xml
@@ -7,7 +7,7 @@
19 Jan 2013
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -22,7 +22,7 @@
- :ETCDIR:/extmap.confextmap.conf
+ @pkgconfdir@/extmap.confextmap.conf
@@ -30,7 +30,7 @@
Description
- :ETCDIR:/extmap.conf is the
+ @pkgconfdir@/extmap.conf is the
configuration file used by afpd to
specify file name extension mappings.
diff --git a/doc/manpages/man8/afpd.8.xml b/doc/manpages/man8/afpd.8.xml
index ee425fe1..fff27580 100644
--- a/doc/manpages/man8/afpd.8.xml
+++ b/doc/manpages/man8/afpd.8.xml
@@ -7,7 +7,7 @@
19 Jan 2013
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -48,7 +48,7 @@
interface to the Unix file system. It is normally started at boot time
by netatalk(8).
- :ETCDIR:/afp.conf is the configuration file
+ @pkgconfdir@/afp.conf is the configuration file
used by afpd to determine the behavior and
configuration of a file server.
@@ -96,7 +96,7 @@
Specifies the configuration file to use. (Defaults to
- :ETCDIR:/afp.conf.)
+ @pkgconfdir@/afp.conf.)
@@ -182,7 +182,7 @@
- :ETCDIR:/afp.conf
+ @pkgconfdir@/afp.conf
configuration file used by afpd
@@ -190,7 +190,7 @@
- :STATEDIR:/netatalk/afp_signature.conf
+ @localstatedir@/netatalk/afp_signature.conf
list of server signature
@@ -198,7 +198,7 @@
- :STATEDIR:/netatalk/afp_voluuid.conf
+ @localstatedir@/netatalk/afp_voluuid.conf
list of UUID for Time Machine volume
@@ -206,7 +206,7 @@
- :ETCDIR:/extmap.conf
+ @pkgconfdir@/extmap.conf
file name extension mapping
@@ -214,7 +214,7 @@
- :ETCDIR:/msg/message.pid
+ @pkgconfdir@/msg/message.pid
contains messages to be sent to users.
diff --git a/doc/manpages/man8/cnid_dbd.8.xml b/doc/manpages/man8/cnid_dbd.8.xml
index 89e87945..9162047b 100644
--- a/doc/manpages/man8/cnid_dbd.8.xml
+++ b/doc/manpages/man8/cnid_dbd.8.xml
@@ -7,7 +7,7 @@
01 Jan 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
diff --git a/doc/manpages/man8/cnid_metad.8.xml b/doc/manpages/man8/cnid_metad.8.xml
index 587694bb..3bd833b6 100644
--- a/doc/manpages/man8/cnid_metad.8.xml
+++ b/doc/manpages/man8/cnid_metad.8.xml
@@ -7,7 +7,7 @@
23 Mar 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -74,7 +74,7 @@
Use configuration file as the
configuration file. The default is
- :ETCDIR:/afp.conf.
+ @pkgconfdir@/afp.conf.
diff --git a/doc/manpages/man8/netatalk.8.xml b/doc/manpages/man8/netatalk.8.xml
index e9496da6..8c980119 100644
--- a/doc/manpages/man8/netatalk.8.xml
+++ b/doc/manpages/man8/netatalk.8.xml
@@ -7,7 +7,7 @@
22 Mar 2012
- :NETATALK_VERSION:
+ @NETATALK_VERSION@
@@ -67,7 +67,7 @@
- :ETCDIR:/afp.conf
+ @pkgconfdir@/afp.conf
configuration file used by afpd and cnid_metad
diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
index 20dede4e..5e72f887 100644
--- a/man/man1/Makefile.am
+++ b/man/man1/Makefile.am
@@ -2,26 +2,16 @@
pkgconfdir = @PKGCONFDIR@
-SUFFIXES= .tmpl .
+man_MANS = \
+ ad.1 \
+ afpldaptest.1 \
+ afppasswd.1 \
+ afpstats.1 \
+ apple_dump.1 \
+ asip-status.pl.1 \
+ dbd.1 \
+ macusers.1 \
+ netatalk-config.1 \
+ uniconv.1
-.tmpl:
- sed -e s@:SBINDIR:@${sbindir}@ \
- -e s@:BINDIR:@${bindir}@ \
- -e s@:ETCDIR:@${pkgconfdir}@ \
- -e s@:LIBDIR:@${libdir}@ \
- -e s@:DEFAULT_CNID_SCHEME:@${DEFAULT_CNID_SCHEME}@ \
- <$< >$@
-
-GENERATED_MANS = uniconv.1 asip-status.pl.1 afpldaptest.1 afpstats.1
-TEMPLATE_FILES = uniconv.1.tmpl asip-status.pl.1.tmpl afpldaptest.1.tmpl afpstats.1.tmpl
-
-NONGENERATED_MANS = ad.1 \
- afppasswd.1 \
- apple_dump.1 \
- dbd.1 \
- macusers.1 \
- netatalk-config.1
-
-man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
-CLEANFILES = $(GENERATED_MANS)
-EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)
+DISTCLEANFILES = $(man_MANS)