Try to move substitution to configure stage

NTmatter · May 13, 2013 · 2f743cb · 2f743cb
1 parent 530376c
commit 2f743cb
Show file tree

Hide file tree

Showing 21 changed files with 79 additions and 91 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +22,15 @@
 
   <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>
 
   <refsect1>
     <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>