Try to move substitution to configure stage

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d8e2be1c5d64f37faf300294d6e7e555cec3d0d1..2869dbb69093dbca31387144866b11371c056e7c 100644 (file)
--- 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 3163d06709f359a5685e8ae11bc54aaea3a2d698..b6a9f551ef476b4cf4bffb0f2c1953bcb5742bcd 100644 (file)
--- a/doc/manpages/man1/ad.1.xml
+++ b/doc/manpages/man1/ad.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">02 Sep 2011</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>

diff --git a/doc/manpages/man1/afpldaptest.1.xml b/doc/manpages/man1/afpldaptest.1.xml
index 52ec6d335c5ffc2e1ef7674411d327e315a18ced..a7e73cdda819c1f89f03d946d497eb1f315e4f6f 100644 (file)
--- a/doc/manpages/man1/afpldaptest.1.xml
+++ b/doc/manpages/man1/afpldaptest.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">22 Mar 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv id="name">
@@ -43,7 +43,7 @@
     <title>DESCRIPTION</title>
 
     <para><command>afpldaptest</command> is a simple command to syntactically
-    check ldap parameters in :ETCDIR:/afp.conf.</para>
+    check ldap parameters in @pkgconfdir@/afp.conf.</para>
 
   </refsect1>
 

diff --git a/doc/manpages/man1/afppasswd.1.xml b/doc/manpages/man1/afppasswd.1.xml
index ccd5ee6d22e0d92220970f4d4702b0111c621259..e67727fd7760b4a2784d7dcc7ed65e90f0bf2674 100644 (file)
--- a/doc/manpages/man1/afppasswd.1.xml
+++ b/doc/manpages/man1/afppasswd.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">22 Mar 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>

diff --git a/doc/manpages/man1/afpstats.1.xml b/doc/manpages/man1/afpstats.1.xml
index b1ab94f2af21fff8b84bc057c9d094554415be79..c2e979905e19dc26ceb9bf3963cdcc72b0183071 100644 (file)
--- a/doc/manpages/man1/afpstats.1.xml
+++ b/doc/manpages/man1/afpstats.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">24 Mar 2013</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv id="name">
@@ -36,7 +36,7 @@
     "<command>afpd -V</command>".</para>
 
     <para>"<option>afpstats = yes</option>" must be set in
-    <filename>:ETCDIR:/afp.conf</filename>.</para>
+    <filename>@pkgconfdir@/afp.conf</filename>.</para>
 
   </refsect1>
 

diff --git a/doc/manpages/man1/apple_dump.1.xml b/doc/manpages/man1/apple_dump.1.xml
index 1723a30c901c49c66413efbb4053c7b2493a3f51..2457d1d140b71da8f3ca116cf9bf706977ba34af 100644 (file)
--- a/doc/manpages/man1/apple_dump.1.xml
+++ b/doc/manpages/man1/apple_dump.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">16 Jul 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv id="name">

diff --git a/doc/manpages/man1/asip-status.pl.1.xml b/doc/manpages/man1/asip-status.pl.1.xml
index d8d5b8ddcf5851647f0683f752c4dd0419cb38ff..859b063f863fc89229a1797fc9655c2cf4a369cb 100644 (file)
--- a/doc/manpages/man1/asip-status.pl.1.xml
+++ b/doc/manpages/man1/asip-status.pl.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">24 Jul 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>

diff --git a/doc/manpages/man1/dbd.1.xml b/doc/manpages/man1/dbd.1.xml
index b3043f3f3e64d323a13aac647a6954a38511e3ea..36b7aba02b2c2e0edd7fa0b25aa8afe5997b335e 100644 (file)
--- a/doc/manpages/man1/dbd.1.xml
+++ b/doc/manpages/man1/dbd.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">28 Dec 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>

diff --git a/doc/manpages/man1/macusers.1.xml b/doc/manpages/man1/macusers.1.xml
index 6f0abb19214e64564ac40b871a7cf37723dedb87..5cfee6f5f4c6eade51f28236c07874d31447a290 100644 (file)
--- a/doc/manpages/man1/macusers.1.xml
+++ b/doc/manpages/man1/macusers.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">13 Oct 2011</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv id="name">

diff --git a/doc/manpages/man1/megatron.1.xml b/doc/manpages/man1/megatron.1.xml
index 34c3d0cc088e0cdf4533f89ebc2dbea9d6dbccd6..20b640590214732631effa4adca90e4d44b3f787 100644 (file)
--- a/doc/manpages/man1/megatron.1.xml
+++ b/doc/manpages/man1/megatron.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">02 Sep 2011</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv id="name">

diff --git a/doc/manpages/man1/netatalk-config.1.xml b/doc/manpages/man1/netatalk-config.1.xml
index 391ae5ce3cbce308b2c1e1439687a3df975de71c..69da13f09f9cbddf998d1e3ba4ff7bc81385cfc5 100644 (file)
--- a/doc/manpages/man1/netatalk-config.1.xml
+++ b/doc/manpages/man1/netatalk-config.1.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">09 June 2001</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
 
     <refmiscinfo class="manual">The Netatalk Project</refmiscinfo>
   </refmeta>

diff --git a/doc/manpages/man1/uniconv.1.xml b/doc/manpages/man1/uniconv.1.xml
index 8f2d84c1e4c2e1d804b63b46c6c81a0569406c1d..d563c289726470802703d32eabe1e37720652ac9 100644 (file)
--- a/doc/manpages/man1/uniconv.1.xml
+++ b/doc/manpages/man1/uniconv.1.xml
@@ -8,7 +8,7 @@
 
     <refmiscinfo class="date">19 Jan 2013</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -53,7 +53,7 @@
         <listitem>
           <para>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</para>
         </listitem>
       </varlistentry>

diff --git a/doc/manpages/man5/afp.conf.5.xml b/doc/manpages/man5/afp.conf.5.xml
index 44b5a4681806a0e8cb8ed24c885455c4165d23bc..f5a5510f04975ff66708797c6b3cf0df348b0012 100644 (file)
--- a/doc/manpages/man5/afp.conf.5.xml
+++ b/doc/manpages/man5/afp.conf.5.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">30 Apr 2013</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -383,7 +383,7 @@
                 <listitem>
                   <para>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 "<option>passwd file</option>". See
                   <citerefentry>
                       <refentrytitle>afppasswd</refentrytitle>
@@ -428,7 +428,7 @@
 
           <listitem>
             <para>Sets the default path for UAMs for this server (default is
-            :LIBDIR:/netatalk).</para>
+            @libdir@/netatalk).</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -509,7 +509,7 @@
 
           <listitem>
             <para>Sets the path to the Randnum UAM passwd file for this server
-            (default is :ETCDIR:/afppasswd).</para>
+            (default is @pkgconfdir@/afppasswd).</para>
           </listitem>
         </varlistentry>
 
@@ -822,7 +822,7 @@
 
           <listitem>
             <para>Sets the path to the file which defines file extension
-            type/creator mappings. (default is :ETCDIR:/extmap.conf).</para>
+            type/creator mappings. (default is @pkgconfdir@/extmap.conf).</para>
           </listitem>
         </varlistentry>
 
@@ -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
-            <filename>:STATEDIR:/netatalk/afp_signature.conf</filename>
+            <filename>@localstatedir@/netatalk/afp_signature.conf</filename>
             automatically (based on random number). See also
             asip-status.pl(1).</para>
           </listitem>
@@ -904,7 +904,7 @@
             <para>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
-            <filename>:STATEDIR:/netatalk/CNID/</filename>.</para>
+            <filename>@localstatedir@/netatalk/CNID/</filename>.</para>
           </listitem>
         </varlistentry>
 
@@ -1446,8 +1446,8 @@
 
           <listitem>
             <para>set the CNID backend to be used for the volume, default is
-            [:DEFAULT_CNID_SCHEME:] available schemes:
-            [:COMPILED_BACKENDS:]</para>
+            [@DEFAULT_CNID_SCHEME@] available schemes:
+            [@compiled_backends@]</para>
           </listitem>
         </varlistentry>
 
@@ -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
-    <filename>:STATEDIR:/netatalk/CNID/(volumename)/.AppleDB/</filename>
+    <filename>@localstatedir@/netatalk/CNID/(volumename)/.AppleDB/</filename>
     directory.</para>
 
     <variablelist>

diff --git a/doc/manpages/man5/afp_signature.conf.5.xml b/doc/manpages/man5/afp_signature.conf.5.xml
index a5ed793a6ea4c081999704b2c3b3715eb3d62b04..287b6d71f91957477fa4768901c23d3558ab60f4 100644 (file)
--- a/doc/manpages/man5/afp_signature.conf.5.xml
+++ b/doc/manpages/man5/afp_signature.conf.5.xml
@@ -8,7 +8,7 @@
 
     <refmiscinfo class="date">23 Mar 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -23,7 +23,7 @@
   <refsect1>
     <title>Description</title>
 
-    <para><filename>:STATEDIR:/netatalk/afp_signature.conf</filename> is the
+    <para><filename>@localstatedir@/netatalk/afp_signature.conf</filename> is the
     configuration file used by <command>afpd</command> to specify
     server signature automagically. The configuration lines are
     composed like:</para>

diff --git a/doc/manpages/man5/afp_voluuid.conf.5.xml b/doc/manpages/man5/afp_voluuid.conf.5.xml
index b91614e0d31ca58543e08775d49eeb7eb433b61d..0956b47415b6e91c11676f873e3bd39830a284f3 100644 (file)
--- a/doc/manpages/man5/afp_voluuid.conf.5.xml
+++ b/doc/manpages/man5/afp_voluuid.conf.5.xml
@@ -8,7 +8,7 @@
 
     <refmiscinfo class="date">23 Mar 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -23,7 +23,7 @@
   <refsect1>
     <title>Description</title>
 
-    <para><filename>:STATEDIR:/netatalk/afp_voluuid.conf</filename> is the
+    <para><filename>@localstatedir@/netatalk/afp_voluuid.conf</filename> is the
     configuration file used by <command>afpd</command> to specify
     UUID of Time Machine volume automagically. The configuration
     lines are composed like:</para>

diff --git a/doc/manpages/man5/extmap.conf.5.xml b/doc/manpages/man5/extmap.conf.5.xml
index f9802f3224a32881c2368dd2e4751a7cabfd4061..4265928dd6f52311642bd70d1554e8afc6490b85 100644 (file)
--- a/doc/manpages/man5/extmap.conf.5.xml
+++ b/doc/manpages/man5/extmap.conf.5.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">19 Jan 2013</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -22,7 +22,7 @@
 
   <refsynopsisdiv id="synopsis">
     <cmdsynopsis>
-      <command>:ETCDIR:/extmap.conf<indexterm><primary>extmap.conf</primary></indexterm></command>
+      <command>@pkgconfdir@/extmap.conf<indexterm><primary>extmap.conf</primary></indexterm></command>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -30,7 +30,7 @@
     <title>Description</title>
 
     <para>
-    <filename>:ETCDIR:/extmap.conf</filename> is the
+    <filename>@pkgconfdir@/extmap.conf</filename> is the
     configuration file used by <command>afpd</command> to
     specify file name extension mappings.</para>
 

diff --git a/doc/manpages/man8/afpd.8.xml b/doc/manpages/man8/afpd.8.xml
index ee425fe10fde0f56f7de15787194a4cd701a6aa5..fff2758005b51c24d20b6cb4ea180d9b8ba864dc 100644 (file)
--- a/doc/manpages/man8/afpd.8.xml
+++ b/doc/manpages/man8/afpd.8.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">19 Jan 2013</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -48,7 +48,7 @@
     interface to the Unix file system. It is normally started at boot time
     by <command>netatalk</command>(8).</para>
 
-    <para><filename>:ETCDIR:/afp.conf</filename> is the configuration file
+    <para><filename>@pkgconfdir@/afp.conf</filename> is the configuration file
     used by <command>afpd</command> to determine the behavior and
     configuration of a file server.</para>
 
@@ -96,7 +96,7 @@
 
         <listitem>
           <para>Specifies the configuration file to use. (Defaults to
-          <filename>:ETCDIR:/afp.conf</filename>.)</para>
+          <filename>@pkgconfdir@/afp.conf</filename>.)</para>
         </listitem>
       </varlistentry>
 
@@ -182,7 +182,7 @@
 
     <variablelist>
       <varlistentry>
-        <term><filename>:ETCDIR:/afp.conf</filename></term>
+        <term><filename>@pkgconfdir@/afp.conf</filename></term>
 
         <listitem>
           <para>configuration file used by afpd</para>
@@ -190,7 +190,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><filename>:STATEDIR:/netatalk/afp_signature.conf</filename></term>
+        <term><filename>@localstatedir@/netatalk/afp_signature.conf</filename></term>
 
         <listitem>
           <para>list of server signature</para>
@@ -198,7 +198,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><filename>:STATEDIR:/netatalk/afp_voluuid.conf</filename></term>
+        <term><filename>@localstatedir@/netatalk/afp_voluuid.conf</filename></term>
 
         <listitem>
           <para>list of UUID for Time Machine volume</para>
@@ -206,7 +206,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><filename>:ETCDIR:/extmap.conf</filename></term>
+        <term><filename>@pkgconfdir@/extmap.conf</filename></term>
 
         <listitem>
           <para>file name extension mapping</para>
@@ -214,7 +214,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><filename>:ETCDIR:/msg/message.pid</filename></term>
+        <term><filename>@pkgconfdir@/msg/message.pid</filename></term>
 
         <listitem>
           <para>contains messages to be sent to users.</para>

diff --git a/doc/manpages/man8/cnid_dbd.8.xml b/doc/manpages/man8/cnid_dbd.8.xml
index 89e87945ec7ee578672a834075ccbc2454ef6862..9162047b31a5fe4a48f81f6e36db39521b8c6632 100644 (file)
--- a/doc/manpages/man8/cnid_dbd.8.xml
+++ b/doc/manpages/man8/cnid_dbd.8.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">01 Jan 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>

diff --git a/doc/manpages/man8/cnid_metad.8.xml b/doc/manpages/man8/cnid_metad.8.xml
index 587694bb3f8c240f3076a2c4ad520aeb1638f71c..3bd833b61c19dc9871f4c8305c68d4f52a1b62fc 100644 (file)
--- a/doc/manpages/man8/cnid_metad.8.xml
+++ b/doc/manpages/man8/cnid_metad.8.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">23 Mar 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -74,7 +74,7 @@
         <listitem>
           <para>Use <emphasis remap="I">configuration file</emphasis> as the
             configuration file. The default is
-            <emphasis remap="I">:ETCDIR:/afp.conf</emphasis>.</para>
+            <emphasis remap="I">@pkgconfdir@/afp.conf</emphasis>.</para>
         </listitem>
       </varlistentry>
 

diff --git a/doc/manpages/man8/netatalk.8.xml b/doc/manpages/man8/netatalk.8.xml
index e9496da645a0f1012a2c2854e524bdebe7e6a6b6..8c980119032cf40e7483cbaa4e9074edd5f4a53e 100644 (file)
--- a/doc/manpages/man8/netatalk.8.xml
+++ b/doc/manpages/man8/netatalk.8.xml
@@ -7,7 +7,7 @@
 
     <refmiscinfo class="date">22 Mar 2012</refmiscinfo>
 
-    <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo>
+    <refmiscinfo class="source">@NETATALK_VERSION@</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -67,7 +67,7 @@
 
     <variablelist>
       <varlistentry>
-        <term><filename>:ETCDIR:/afp.conf</filename></term>
+        <term><filename>@pkgconfdir@/afp.conf</filename></term>
 
         <listitem>
           <para>configuration file used by afpd and cnid_metad</para>

diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
index 20dede4e188c4629aeb35982499a9bf8c5fba648..5e72f887206a82410d5bb861ac916c5c324487e8 100644 (file)
--- 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)