From 078278ce973d8513474e9505095a04f3a6db04c0 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Tue, 14 May 2013 06:52:03 +0200 Subject: [PATCH] Finish renaming --- Makefile.am | 4 +- configure.ac | 21 +++++++ doc/.gitignore | 4 +- doc/Makefile.am | 55 +--------------- doc/manpages/Makefile.am | 1 + doc/manpages/man1/.gitignore | 1 + doc/manpages/man1/Makefile.am | 24 +++++++ doc/manpages/man5/.gitignore | 1 + doc/manpages/man5/Makefile.am | 17 +++++ doc/manpages/man8/.gitignore | 1 + doc/manpages/man8/Makefile.am | 17 +++++ doc/manual/.gitignore | 1 + man/.gitignore | 1 - man/man1/.gitignore | 10 +-- man/man1/Makefile.am | 4 +- man/man1/{ad.1 => ad.1.in} | 6 +- .../{afpldaptest.1.tmpl => afpldaptest.1.in} | 8 +-- man/man1/{afppasswd.1 => afppasswd.1.in} | 6 +- man/man1/{afpstats.1.tmpl => afpstats.1.in} | 8 +-- man/man1/{apple_dump.1 => apple_dump.1.in} | 6 +- ...p-status.pl.1.tmpl => asip-status.pl.1.in} | 6 +- man/man1/{dbd.1 => dbd.1.in} | 6 +- man/man1/{macusers.1 => macusers.1.in} | 6 +- man/man1/{megatron.1 => megatron.1.in} | 6 +- ...netatalk-config.1 => netatalk-config.1.in} | 4 +- man/man1/{uniconv.1.tmpl => uniconv.1.in} | 8 +-- man/man5/.gitignore | 1 - man/man5/Makefile.am | 28 ++------- man/man5/{afp.conf.5.tmpl => afp.conf.5.in} | 63 +++++++++++-------- ...re.conf.5.tmpl => afp_signature.conf.5.in} | 8 +-- ...uuid.conf.5.tmpl => afp_voluuid.conf.5.in} | 8 +-- .../{extmap.conf.5.tmpl => extmap.conf.5.in} | 12 ++-- man/man8/.gitignore | 11 +--- man/man8/Makefile.am | 27 ++------ man/man8/{afpd.8.tmpl => afpd.8.in} | 20 +++--- man/man8/{cnid_dbd.8.tmpl => cnid_dbd.8.in} | 6 +- .../{cnid_metad.8.tmpl => cnid_metad.8.in} | 8 +-- man/man8/{netatalk.8.tmpl => netatalk.8.in} | 8 +-- 38 files changed, 212 insertions(+), 220 deletions(-) create mode 100644 doc/manpages/Makefile.am create mode 100644 doc/manpages/man1/.gitignore create mode 100644 doc/manpages/man1/Makefile.am create mode 100644 doc/manpages/man5/.gitignore create mode 100644 doc/manpages/man5/Makefile.am create mode 100644 doc/manpages/man8/.gitignore create mode 100644 doc/manpages/man8/Makefile.am create mode 100644 doc/manual/.gitignore rename man/man1/{ad.1 => ad.1.in} (98%) rename man/man1/{afpldaptest.1.tmpl => afpldaptest.1.in} (88%) rename man/man1/{afppasswd.1 => afppasswd.1.in} (95%) rename man/man1/{afpstats.1.tmpl => afpstats.1.in} (89%) rename man/man1/{apple_dump.1 => apple_dump.1.in} (95%) rename man/man1/{asip-status.pl.1.tmpl => asip-status.pl.1.in} (96%) rename man/man1/{dbd.1 => dbd.1.in} (93%) rename man/man1/{macusers.1 => macusers.1.in} (91%) rename man/man1/{megatron.1 => megatron.1.in} (96%) rename man/man1/{netatalk-config.1 => netatalk-config.1.in} (96%) rename man/man1/{uniconv.1.tmpl => uniconv.1.in} (96%) rename man/man5/{afp.conf.5.tmpl => afp.conf.5.in} (92%) rename man/man5/{afp_signature.conf.5.tmpl => afp_signature.conf.5.in} (93%) rename man/man5/{afp_voluuid.conf.5.tmpl => afp_voluuid.conf.5.in} (93%) rename man/man5/{extmap.conf.5.tmpl => extmap.conf.5.in} (88%) rename man/man8/{afpd.8.tmpl => afpd.8.in} (91%) rename man/man8/{cnid_dbd.8.tmpl => cnid_dbd.8.in} (98%) rename man/man8/{cnid_metad.8.tmpl => cnid_metad.8.in} (93%) rename man/man8/{netatalk.8.tmpl => netatalk.8.in} (91%) diff --git a/Makefile.am b/Makefile.am index 36a8c3cd..4d714f2d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,9 @@ # Makefile.am for top level of netatalk package if USE_BUILTIN_LIBEVENT -SUBDIRS = libevent include libatalk bin config etc man contrib distrib doc macros test +SUBDIRS = libevent include libatalk bin config etc contrib distrib doc man macros test else -SUBDIRS = include libatalk bin config etc man contrib distrib doc macros test +SUBDIRS = include libatalk bin config etc contrib distrib doc man macros test endif EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION diff --git a/configure.ac b/configure.ac index fd252e6f..ade3cf6c 100644 --- a/configure.ac +++ b/configure.ac @@ -252,6 +252,9 @@ AC_OUTPUT([Makefile doc/html.xsl doc/man.xsl doc/manual/manual.xml + doc/manpages/Makefile + doc/manpages/man1/Makefile + doc/manpages/man8/Makefile etc/Makefile etc/afpd/Makefile etc/cnid_dbd/Makefile @@ -279,8 +282,26 @@ AC_OUTPUT([Makefile macros/Makefile man/Makefile man/man1/Makefile + man/man1/ad.1 + man/man1/afpldaptest.1 + man/man1/afppasswd.1 + man/man1/afpstats.1 + man/man1/apple_dump.1 + man/man1/asip-status.pl.1 + man/man1/dbd.1 + man/man1/macusers.1 + man/man1/netatalk-config.1 + man/man1/uniconv.1 man/man5/Makefile + man/man5/afp.conf.5 + man/man5/afp_signature.conf.5 + man/man5/afp_voluuid.conf.5 + man/man5/extmap.conf.5 man/man8/Makefile + man/man8/afpd.8 + man/man8/cnid_dbd.8 + man/man8/cnid_metad.8 + man/man8/netatalk.8 test/Makefile test/afpd/Makefile ], diff --git a/doc/.gitignore b/doc/.gitignore index ade949aa..c8189ad1 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,4 +1,4 @@ Makefile.in Makefile -.gitignore -*.o +html.xsl +man.xsl \ No newline at end of file diff --git a/doc/Makefile.am b/doc/Makefile.am index 2869dbb6..e4e156e3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,64 +1,13 @@ +SUBDIRS = XSLTPROC=@XSLTPROC@ XSLTPROC_FLAGS=@XSLTPROC_FLAGS@ XHTML_STYLESHEET=$(top_srcdir)/doc/html.xsl -MAN_STYLESHEET=$(top_srcdir)/doc/man.xsl htmldir = $(prefix)/share/doc/@PACKAGE@ dist_html_DATA = @PACKAGE@.html -XML_MANPAGES = \ - ${top_srcdir}/doc/manpages/man1/ad.1.xml \ - ${top_srcdir}/doc/manpages/man1/afpldaptest.1.xml \ - ${top_srcdir}/doc/manpages/man1/afppasswd.1.xml \ - ${top_srcdir}/doc/manpages/man1/afpstats.1.xml \ - ${top_srcdir}/doc/manpages/man1/apple_dump.1.xml \ - ${top_srcdir}/doc/manpages/man1/asip-status.pl.1.xml \ - ${top_srcdir}/doc/manpages/man1/dbd.1.xml \ - ${top_srcdir}/doc/manpages/man1/macusers.1.xml \ - ${top_srcdir}/doc/manpages/man1/megatron.1.xml \ - ${top_srcdir}/doc/manpages/man1/netatalk-config.1.xml \ - ${top_srcdir}/doc/manpages/man1/uniconv.1.xml \ - ${top_srcdir}/doc/manpages/man5/afp_signature.conf.5.xml \ - ${top_srcdir}/doc/manpages/man5/afp_voluuid.conf.5.xml \ - ${top_srcdir}/doc/manpages/man5/afp.conf.5.xml \ - ${top_srcdir}/doc/manpages/man5/extmap.conf.5.xml \ - ${top_srcdir}/doc/manpages/man8/afpd.8.xml \ - ${top_srcdir}/doc/manpages/man8/cnid_dbd.8.xml \ - ${top_srcdir}/doc/manpages/man8/cnid_metad.8.xml \ - ${top_srcdir}/doc/manpages/man8/netatalk.8.xml - -MAN_MANPAGES = \ - ${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) $< - 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) $< -${top_srcdir}/man/man8/%.8.in : $(MAN_STYLESHEET) ${top_srcdir}/doc/manpages/man8/%.8.xml - @xsltproc -o $(top_builddir)/man/man8/ $(MAN_STYLESHEET) $< - -all-local: $(MAN_MANPAGES) - + SUBDIRS += manpages endif distclean-local: diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am new file mode 100644 index 00000000..4bc3be50 --- /dev/null +++ b/doc/manpages/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = man1 man5 man8 \ No newline at end of file diff --git a/doc/manpages/man1/.gitignore b/doc/manpages/man1/.gitignore new file mode 100644 index 00000000..7943d1d6 --- /dev/null +++ b/doc/manpages/man1/.gitignore @@ -0,0 +1 @@ +*\.1 \ No newline at end of file diff --git a/doc/manpages/man1/Makefile.am b/doc/manpages/man1/Makefile.am new file mode 100644 index 00000000..7c750e31 --- /dev/null +++ b/doc/manpages/man1/Makefile.am @@ -0,0 +1,24 @@ +XSLTPROC=@XSLTPROC@ +XSLTPROC_FLAGS=@XSLTPROC_FLAGS@ +MAN_STYLESHEET=$(top_srcdir)/doc/man.xsl + +MAN_MANPAGES = \ + ad.1 \ + afpldaptest.1 \ + afppasswd.1 \ + afpstats.1 \ + apple_dump.1 \ + asip-status.pl.1 \ + dbd.1 \ + macusers.1 \ + megatron.1 \ + netatalk-config.1 \ + uniconv.1 + +CLEANFILES = $(MAN_MANPAGES) + +%.1 : $(MAN_STYLESHEET) %.1.xml + @xsltproc $(MAN_STYLESHEET) $< + @cp $@ $(top_builddir)/man/man1/$@.in + +html-local: $(MAN_MANPAGES) diff --git a/doc/manpages/man5/.gitignore b/doc/manpages/man5/.gitignore new file mode 100644 index 00000000..2fc1d34e --- /dev/null +++ b/doc/manpages/man5/.gitignore @@ -0,0 +1 @@ +*\.5 diff --git a/doc/manpages/man5/Makefile.am b/doc/manpages/man5/Makefile.am new file mode 100644 index 00000000..0188bcac --- /dev/null +++ b/doc/manpages/man5/Makefile.am @@ -0,0 +1,17 @@ +XSLTPROC=@XSLTPROC@ +XSLTPROC_FLAGS=@XSLTPROC_FLAGS@ +MAN_STYLESHEET=$(top_srcdir)/doc/man.xsl + +MAN_MANPAGES = \ + afp.conf.5 \ + afp_signature.conf.5 \ + afp_voluuid.conf.5 \ + extmap.conf.5 + +CLEANFILES = $(MAN_MANPAGES) + +%.5 : $(MAN_STYLESHEET) %.5.xml + @xsltproc $(MAN_STYLESHEET) $< + @cp $@ $(top_builddir)/man/man5/$@.in + +html-local: $(MAN_MANPAGES) diff --git a/doc/manpages/man8/.gitignore b/doc/manpages/man8/.gitignore new file mode 100644 index 00000000..c756d8f5 --- /dev/null +++ b/doc/manpages/man8/.gitignore @@ -0,0 +1 @@ +*\.8 diff --git a/doc/manpages/man8/Makefile.am b/doc/manpages/man8/Makefile.am new file mode 100644 index 00000000..cf6c1f27 --- /dev/null +++ b/doc/manpages/man8/Makefile.am @@ -0,0 +1,17 @@ +XSLTPROC=@XSLTPROC@ +XSLTPROC_FLAGS=@XSLTPROC_FLAGS@ +MAN_STYLESHEET=$(top_srcdir)/doc/man.xsl + +MAN_MANPAGES = \ + afpd.8 \ + cnid_dbd.8 \ + cnid_metad.8 \ + netatalk.8 + +CLEANFILES = $(MAN_MANPAGES) + +%.8 : $(MAN_STYLESHEET) %.8.xml + @xsltproc $(MAN_STYLESHEET) $< + @cp $@ $(top_builddir)/man/man8/$@.in + +html-local: $(MAN_MANPAGES) diff --git a/doc/manual/.gitignore b/doc/manual/.gitignore new file mode 100644 index 00000000..8eb18aa7 --- /dev/null +++ b/doc/manual/.gitignore @@ -0,0 +1 @@ +manual.xml diff --git a/man/.gitignore b/man/.gitignore index 895a5e77..8f1b0d99 100644 --- a/man/.gitignore +++ b/man/.gitignore @@ -1,4 +1,3 @@ Makefile Makefile.in -.gitignore *.o diff --git a/man/man1/.gitignore b/man/man1/.gitignore index 39ffeb2f..0ac9461e 100644 --- a/man/man1/.gitignore +++ b/man/man1/.gitignore @@ -1,11 +1,3 @@ Makefile Makefile.in -apple_cp.1 -apple_dump.1 -apple_mv.1 -apple_rm.1 -asip-status.pl.1 -afpldaptest.1 -afpstats.1 -uniconv.1 -*.o +*.1 diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am index 5e72f887..09ee0be7 100644 --- a/man/man1/Makefile.am +++ b/man/man1/Makefile.am @@ -1,7 +1,5 @@ # Makefile.am for man/man1/ -pkgconfdir = @PKGCONFDIR@ - man_MANS = \ ad.1 \ afpldaptest.1 \ @@ -14,4 +12,4 @@ man_MANS = \ netatalk-config.1 \ uniconv.1 -DISTCLEANFILES = $(man_MANS) +CLEANFILES = $(man_MANS) diff --git a/man/man1/ad.1 b/man/man1/ad.1.in similarity index 98% rename from man/man1/ad.1 rename to man/man1/ad.1.in index 0e51d128..1a807cfe 100644 --- a/man/man1/ad.1 +++ b/man/man1/ad.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 02 Sep 2011 -.\" Manual: Netatalk 3.0.4dev -.\" Source: Netatalk 3.0.4dev +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "AD" "1" "02 Sep 2011" "Netatalk 3.0.4dev" "Netatalk 3.0.4dev" +.TH "AD" "1" "02 Sep 2011" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/afpldaptest.1.tmpl b/man/man1/afpldaptest.1.in similarity index 88% rename from man/man1/afpldaptest.1.tmpl rename to man/man1/afpldaptest.1.in index 5c4c67f4..94d6bd50 100644 --- a/man/man1/afpldaptest.1.tmpl +++ b/man/man1/afpldaptest.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 22 Mar 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "AFPLDAPTEST" "1" "22 Mar 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "AFPLDAPTEST" "1" "22 Mar 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ afpldaptest \- Syntactically check ldap parameters in afp\&.conf .SH "DESCRIPTION" .PP \fBafpldaptest\fR -is a simple command to syntactically check ldap parameters in :ETCDIR:/afp\&.conf\&. +is a simple command to syntactically check ldap parameters in @pkgconfdir@/afp\&.conf\&. .SH "OPTIONS" .PP \fB\-u\fR \fIUSER\fR diff --git a/man/man1/afppasswd.1 b/man/man1/afppasswd.1.in similarity index 95% rename from man/man1/afppasswd.1 rename to man/man1/afppasswd.1.in index 60d640c0..6acce227 100644 --- a/man/man1/afppasswd.1 +++ b/man/man1/afppasswd.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 22 Mar 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "AFPPASSWD" "1" "22 Mar 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "AFPPASSWD" "1" "22 Mar 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/afpstats.1.tmpl b/man/man1/afpstats.1.in similarity index 89% rename from man/man1/afpstats.1.tmpl rename to man/man1/afpstats.1.in index b7980996..16dc0b1d 100644 --- a/man/man1/afpstats.1.tmpl +++ b/man/man1/afpstats.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 24 Mar 2013 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "AFPSTATS" "1" "24 Mar 2013" "Netatalk 3.0" "Netatalk 3.0" +.TH "AFPSTATS" "1" "24 Mar 2013" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,7 +42,7 @@ list AFP statistics via D\-Bus IPC\&. must support D\-Bus\&. Check it by "\fBafpd \-V\fR"\&. .PP "\fBafpstats = yes\fR" must be set in -:ETCDIR:/afp\&.conf\&. +@pkgconfdir@/afp\&.conf\&. .SH "SEE ALSO" .PP \fBafpd\fR(8), diff --git a/man/man1/apple_dump.1 b/man/man1/apple_dump.1.in similarity index 95% rename from man/man1/apple_dump.1 rename to man/man1/apple_dump.1.in index f8676fda..c9d7ff64 100644 --- a/man/man1/apple_dump.1 +++ b/man/man1/apple_dump.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 16 Jul 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "APPLE_DUMP" "1" "16 Jul 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "APPLE_DUMP" "1" "16 Jul 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/asip-status.pl.1.tmpl b/man/man1/asip-status.pl.1.in similarity index 96% rename from man/man1/asip-status.pl.1.tmpl rename to man/man1/asip-status.pl.1.in index 735f8eb7..29636178 100644 --- a/man/man1/asip-status.pl.1.tmpl +++ b/man/man1/asip-status.pl.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 24 Jul 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "ASIP\-STATUS\&.PL" "1" "24 Jul 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "ASIP\-STATUS\&.PL" "1" "24 Jul 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/dbd.1 b/man/man1/dbd.1.in similarity index 93% rename from man/man1/dbd.1 rename to man/man1/dbd.1.in index 214b31d3..ad233a9b 100644 --- a/man/man1/dbd.1 +++ b/man/man1/dbd.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 28 Dec 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "DBD" "1" "28 Dec 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "DBD" "1" "28 Dec 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/macusers.1 b/man/man1/macusers.1.in similarity index 91% rename from man/man1/macusers.1 rename to man/man1/macusers.1.in index 6da607b7..ed948b21 100644 --- a/man/man1/macusers.1 +++ b/man/man1/macusers.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 13 Oct 2011 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "MACUSERS" "1" "13 Oct 2011" "Netatalk 3.0" "Netatalk 3.0" +.TH "MACUSERS" "1" "13 Oct 2011" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/megatron.1 b/man/man1/megatron.1.in similarity index 96% rename from man/man1/megatron.1 rename to man/man1/megatron.1.in index 300bd4fd..9b47c228 100644 --- a/man/man1/megatron.1 +++ b/man/man1/megatron.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 02 Sep 2011 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "MEGATRON" "1" "02 Sep 2011" "Netatalk 3.0" "Netatalk 3.0" +.TH "MEGATRON" "1" "02 Sep 2011" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/netatalk-config.1 b/man/man1/netatalk-config.1.in similarity index 96% rename from man/man1/netatalk-config.1 rename to man/man1/netatalk-config.1.in index 7208ce26..f4947fa6 100644 --- a/man/man1/netatalk-config.1 +++ b/man/man1/netatalk-config.1.in @@ -4,10 +4,10 @@ .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 09 June 2001 .\" Manual: The Netatalk Project -.\" Source: Netatalk 3.0 +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "NETATALK\-CONFIG" "1" "09 June 2001" "Netatalk 3.0" "The Netatalk Project" +.TH "NETATALK\-CONFIG" "1" "09 June 2001" "@NETATALK_VERSION@" "The Netatalk Project" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/uniconv.1.tmpl b/man/man1/uniconv.1.in similarity index 96% rename from man/man1/uniconv.1.tmpl rename to man/man1/uniconv.1.in index fabf30c6..1ec27797 100644 --- a/man/man1/uniconv.1.tmpl +++ b/man/man1/uniconv.1.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 19 Jan 2013 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "UNICONV" "1" "19 Jan 2013" "Netatalk 3.0" "Netatalk 3.0" +.TH "UNICONV" "1" "19 Jan 2013" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -46,7 +46,7 @@ encoding\&. .PP \-c .RS 4 -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 used +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 used .RE .PP \-d diff --git a/man/man5/.gitignore b/man/man5/.gitignore index ba10eeb0..99904603 100644 --- a/man/man5/.gitignore +++ b/man/man5/.gitignore @@ -1,4 +1,3 @@ Makefile Makefile.in *.5 -*.o diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am index e9066c8b..31404cdb 100644 --- a/man/man5/Makefile.am +++ b/man/man5/Makefile.am @@ -1,25 +1,9 @@ # Makefile.am for man/man5/ -pkgconfdir = @PKGCONFDIR@ +man_MANS = \ + afp.conf.5 \ + afp_signature.conf.5 \ + afp_voluuid.conf.5 \ + extmap.conf.5 -SUFFIXES = .tmpl . - -.tmpl: - sed -e "s@:SBINDIR:@${sbindir}@g" \ - -e "s@:BINDIR:@${bindir}@g" \ - -e "s@:ETCDIR:@${pkgconfdir}@g" \ - -e "s@:LIBDIR:@${libdir}@g" \ - -e "s@:STATEDIR:@${localstatedir}@g" \ - -e "s@:DEFAULT_CNID_SCHEME:@${DEFAULT_CNID_SCHEME}@g" \ - -e "s@:COMPILED_BACKENDS:@${compiled_backends}@g" \ - <$< >$@ - -GENERATED_MANS = afp.conf.5 afp_signature.conf.5 afp_voluuid.conf.5 extmap.conf.5 -TEMPLATE_FILES = afp.conf.5.tmpl afp_signature.conf.5.tmpl afp_voluuid.conf.5.tmpl extmap.conf.5.tmpl -NONGENERATED_MANS = - -man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS) - -CLEANFILES = $(GENERATED_MANS) - -EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS) +CLEANFILES = $(man_MANS) diff --git a/man/man5/afp.conf.5.tmpl b/man/man5/afp.conf.5.in similarity index 92% rename from man/man5/afp.conf.5.tmpl rename to man/man5/afp.conf.5.in index 60ec8d0e..a650d5ff 100644 --- a/man/man5/afp.conf.5.tmpl +++ b/man/man5/afp.conf.5.in @@ -2,12 +2,12 @@ .\" Title: afp.conf .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 19 Feb 2013 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Date: 30 Apr 2013 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "AFP\&.CONF" "5" "19 Feb 2013" "Netatalk 3.0" "Netatalk 3.0" +.TH "AFP\&.CONF" "5" "30 Apr 2013" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -307,7 +307,7 @@ uams_clrtxt\&.so .PP uams_randum\&.so .RS 4 -allows Random Number and Two\-Way Random Number Exchange for authentication (requires a separate file containing the passwords, either :ETCDIR:/afppasswd file or the one specified via "\fBpasswd file\fR"\&. See +allows Random Number and Two\-Way Random Number Exchange for authentication (requires a separate file containing the passwords, either @pkgconfdir@/afppasswd file or the one specified via "\fBpasswd file\fR"\&. See \fBafppasswd\fR(1) for details\&. (legacy) .RE @@ -330,7 +330,7 @@ Allow Kerberos V for authentication (optional) .PP uam path = \fIpath\fR \fB(G)\fR .RS 4 -Sets the default path for UAMs for this server (default is :LIBDIR:/netatalk)\&. +Sets the default path for UAMs for this server (default is @libdir@/netatalk)\&. .RE .SS "Charset Options" .PP @@ -383,7 +383,7 @@ Specifies the encoding of the volumes filesystem\&. By default, it is the same a .PP passwd file = \fIpath\fR \fB(G)\fR .RS 4 -Sets the path to the Randnum UAM passwd file for this server (default is :ETCDIR:/afppasswd)\&. +Sets the path to the Randnum UAM passwd file for this server (default is @pkgconfdir@/afppasswd)\&. .RE .PP passwd minlen = \fInumber\fR \fB(G)\fR @@ -540,7 +540,7 @@ Default size is 8192, maximum size is 131072\&. Given value is rounded up to nea .PP extmap file = \fIpath\fR \fB(G)\fR .RS 4 -Sets the path to the file which defines file extension type/creator mappings\&. (default is :ETCDIR:/extmap\&.conf)\&. +Sets the path to the file which defines file extension type/creator mappings\&. (default is @pkgconfdir@/extmap\&.conf)\&. .RE .PP guest account = \fIname\fR \fB(G)\fR @@ -561,20 +561,15 @@ Sets a message to be displayed when clients logon to the server\&. The message s and should be quoted\&. Extended characters are allowed\&. .RE .PP -map acls = \fIBOOLEAN\fR (default: \fIyes\fR) \fB(G)\fR -.RS 4 -Whether to map filesystem ACLs to effective permissions\&. -.RE -.PP mimic model = \fImodel\fR \fB(G)\fR .RS 4 -Specifies the icon model that appears on clients\&. Defaults to off\&. Examples: RackMac (same as Xserve), PowerBook, PowerMac, Macmini, iMac, MacBook, MacBookPro, MacBookAir, MacPro, AppleTV1,1, AirPort\&. +Specifies the icon model that appears on clients\&. Defaults to off\&. Note that afpd must support Zeroconf\&. Examples: RackMac (same as Xserve), PowerBook, PowerMac, Macmini, iMac, MacBook, MacBookPro, MacBookAir, MacPro, AppleTV1,1, AirPort\&. .RE .PP signature = \fB(G)\fR .RS 4 Specify a server signature\&. The maximum length is 16 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)\&. .RE .PP @@ -586,7 +581,7 @@ Use share reservations on Solaris\&. Solaris CIFS server uses this too, so this vol dbpath = \fIpath\fR \fB(G)\fR .RS 4 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/\&. .RE .PP volnamelen = \fInumber\fR \fB(G)\fR @@ -700,9 +695,29 @@ Do not use this option any longer as present Netatalk correctly supports server .RE .SS "Options for ACL handling" .PP -For a basic mode of operation there\*(Aqs nothing to configure\&. afpd reads ACLs on the fly, calculating effective permissions and returning the calculated permissions via the so called UARights permission bits\&. On a Mac the Finder uses these bits to adjust permission in Finder windows\&. For example folder whos UNIX mode would only result in in read\-only permissions for a user will not be displayed with a read\-only icon and the user will be able to write to the folder given the folder has an ACL giving the user write access\&. +By default, the effective permission of the authenticated user are only mapped to the mentioned UARights permission structure, not the UNIX mode\&. You can adjust this behaviour with the configuration option +\fBmac acls\fR: +.PP +map acls = \fInone|rights|mode\fR \fB(G)\fR +.RS 4 .PP -However, neither in Finder "Get Info" windows nor in Terminal will you be able to see the ACLs, that\*(Aqs a result of how ACLs in OS X are designed\&. If you want to be able to display ACLs on the client, things get more involved as you must then setup both client and server to be part on a authentication domain (directory service, eg LDAP, OpenDirectory)\&. The reason is, that in OS X ACLs are bound to UUIDs, not just uid\*(Aqs or gid\*(Aqs\&. Therefor afpd must be able to map every filesystem uid and gid to a UUID so that it can return the server side ACLs which are bound to UNIX uid and gid mapped to OS X UUIDs\&. Get it? Read on\&. +none +.RS 4 +no mapping of ACLs +.RE +.PP +rights +.RS 4 +effective permissions are mapped to UARights structure\&. This is the default\&. +.RE +.PP +mode +.RS 4 +ACLs are additionally mapped to the UNIX mode of the filesystem object\&. +.RE +.RE +.PP +If you want to be able to display ACLs on the client, you must setup both client and server as part on a authentication domain (directory service, eg LDAP, Open Directory, Active Directory)\&. The reason is, in OS X ACLs are bound to UUIDs, not just uid\*(Aqs or gid\*(Aqs\&. Therefor Netatalk must be able to map every filesystem uid and gid to a UUID so that it can return the server side ACLs which are bound to UNIX uid and gid mapped to OS X UUIDs\&. .PP Netatalk can query a directory server using LDAP queries\&. Either the directory server already provides an UUID attribute for user and groups (Active Directory, Open Directory) or you reuse an unused attribute (or add a new one) to you directory server (eg OpenLDAP)\&. .PP @@ -811,17 +826,13 @@ Name of the LDAP attribute with the groups short name\&. .SH "EXPLANATION OF VOLUME PARAMETERS" .SS "Parameters" .PP -The section name defines the volume name which is the name that appears in the Chooser or the "connect to server" dialog on Macintoshes to represent the appropriate share\&. No two volumes may have the same name\&. The volume name cannot contain the +The section name defines the volume name\&. No two volumes may have the same name\&. The volume name cannot contain the \*(Aq:\*(Aq character\&. The volume name is mangled if it is very long\&. Mac charset volume name is limited to 27 characters\&. UTF8\-MAC volume name is limited to volnamelen parameter\&. .PP path = \fIPATH\fR \fB(V)\fR .RS 4 -The path name must be a fully qualified path name, or a path name using either the ~ shell shorthand or any of the substitution variables, which are listed below\&. -.sp -The volume name is the name that appears in the Chooser ot the "connect to server" dialog on Macintoshes to represent the appropriate share\&. If volumename is unspecified, the last component of pathname is used\&. No two volumes may have the same name\&. If there are spaces in the name, it should be in quotes (i\&.e\&. "File Share")\&. The volume name cannot contain the -\*(Aq:\*(Aq -character\&. The volume name is mangled if it is very long\&. Mac charset volume name is limited to 27 characters\&. UTF8\-MAC volume name is limited to volnamelen parameter\&. +The path name must be a fully qualified path name\&. .RE .PP appledouble = \fIea|v2\fR \fB(V)\fR @@ -873,7 +884,7 @@ Example: hosts deny = 192\&.168\&.100/24 10\&.1\&.1\&.1 2001:db8::1428:57ab .PP cnid scheme = \fIbackend\fR \fB(V)\fR .RS 4 -set the CNID backend to be used for the volume, default is [:DEFAULT_CNID_SCHEME:] available schemes: [:COMPILED_BACKENDS:] +set the CNID backend to be used for the volume, default is [@DEFAULT_CNID_SCHEME@] available schemes: [@compiled_backends@] .RE .PP ea = \fInone|auto|sys|ad\fR \fB(V)\fR @@ -1089,7 +1100,7 @@ and .SH "CNID BACKENDS" .PP The AFP protocol mostly refers to files and directories by ID and not by name\&. Netatalk needs a way to store these ID\*(Aqs 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\&. .PP cdb diff --git a/man/man5/afp_signature.conf.5.tmpl b/man/man5/afp_signature.conf.5.in similarity index 93% rename from man/man5/afp_signature.conf.5.tmpl rename to man/man5/afp_signature.conf.5.in index 2f5fe403..c620ef05 100644 --- a/man/man5/afp_signature.conf.5.tmpl +++ b/man/man5/afp_signature.conf.5.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 23 Mar 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "AFP_SIGNATURE\&.CONF" "5" "23 Mar 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "AFP_SIGNATURE\&.CONF" "5" "23 Mar 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ afp_signature.conf \- Configuration file used by afpd(8) to specify server signature .SH "DESCRIPTION" .PP -:STATEDIR:/netatalk/afp_signature\&.conf +@localstatedir@/netatalk/afp_signature\&.conf is the configuration file used by \fBafpd\fR to specify server signature automagically\&. The configuration lines are composed like: diff --git a/man/man5/afp_voluuid.conf.5.tmpl b/man/man5/afp_voluuid.conf.5.in similarity index 93% rename from man/man5/afp_voluuid.conf.5.tmpl rename to man/man5/afp_voluuid.conf.5.in index a9fb2ddf..21612dd8 100644 --- a/man/man5/afp_voluuid.conf.5.tmpl +++ b/man/man5/afp_voluuid.conf.5.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 23 Mar 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "AFP_VOLUUID\&.CONF" "5" "23 Mar 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "AFP_VOLUUID\&.CONF" "5" "23 Mar 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ afp_voluuid.conf \- Configuration file used by afpd(8) to specify UUID for Time Machine volume .SH "DESCRIPTION" .PP -:STATEDIR:/netatalk/afp_voluuid\&.conf +@localstatedir@/netatalk/afp_voluuid\&.conf is the configuration file used by \fBafpd\fR to specify UUID of Time Machine volume automagically\&. The configuration lines are composed like: diff --git a/man/man5/extmap.conf.5.tmpl b/man/man5/extmap.conf.5.in similarity index 88% rename from man/man5/extmap.conf.5.tmpl rename to man/man5/extmap.conf.5.in index 9c6679fa..9e0abfaa 100644 --- a/man/man5/extmap.conf.5.tmpl +++ b/man/man5/extmap.conf.5.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 19 Jan 2013 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "EXTMAP\&.CONF" "5" "19 Jan 2013" "Netatalk 3.0" "Netatalk 3.0" +.TH "EXTMAP\&.CONF" "5" "19 Jan 2013" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -30,12 +30,12 @@ .SH "NAME" extmap.conf \- Configuration file used by afpd(8) to specify file name extension mappings\&. .SH "SYNOPSIS" -.HP \w'\fB:ETCDIR:/extmap\&.conf\fR\fB\fR\ 'u -\fB:ETCDIR:/extmap\&.conf\fR\fB\fR +.HP \w'\fB@pkgconfdir@/extmap\&.conf\fR\fB\fR\ 'u +\fB@pkgconfdir@/extmap\&.conf\fR\fB\fR .SH "DESCRIPTION" .PP -:ETCDIR:/extmap\&.conf +@pkgconfdir@/extmap\&.conf is the configuration file used by \fBafpd\fR to specify file name extension mappings\&. diff --git a/man/man8/.gitignore b/man/man8/.gitignore index 711b8c36..29043a09 100644 --- a/man/man8/.gitignore +++ b/man/man8/.gitignore @@ -1,12 +1,3 @@ Makefile Makefile.in -afpd.8 -afp_acls.8 -atalkd.8 -cnid_dbd.8 -cnid_metad.8 -netatalk.8 -papd.8 -papstatus.8 -psf.8 -*.o +*.8 diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am index eb112ab3..f93850e3 100644 --- a/man/man8/Makefile.am +++ b/man/man8/Makefile.am @@ -1,24 +1,9 @@ ## Makefile.am for man/man8/ -pkgconfdir = @PKGCONFDIR@ +man_MANS = \ + afpd.8 \ + cnid_dbd.8 \ + cnid_metad.8 \ + netatalk.8 -SUFFIXES = .tmpl . - -.tmpl: - sed -e s@:SBINDIR:@${sbindir}@ \ - -e s@:BINDIR:@${bindir}@ \ - -e s@:ETCDIR:@${pkgconfdir}@ \ - -e s@:LIBDIR:@${libdir}@ \ - -e s@:LIBEXECDIR:@${libexecdir}@ \ - -e "s@:STATEDIR:@${localstatedir}@g" \ - -e s@:NETATALK_VERSION:@${NETATALK_VERSION}@ \ - <$< >$@ - -GENERATED_MANS = afpd.8 cnid_dbd.8 cnid_metad.8 netatalk.8 -TEMPLATE_FILES = afpd.8.tmpl cnid_dbd.8.tmpl cnid_metad.8.tmpl netatalk.8.tmpl - -man_MANS = $(GENERATED_MANS) - -CLEANFILES = $(GENERATED_MANS) - -EXTRA_DIST = $(TEMPLATE_FILES) +CLEANFILES = $(man_MANS) diff --git a/man/man8/afpd.8.tmpl b/man/man8/afpd.8.in similarity index 91% rename from man/man8/afpd.8.tmpl rename to man/man8/afpd.8.in index 9f09a64b..ab40fa3d 100644 --- a/man/man8/afpd.8.tmpl +++ b/man/man8/afpd.8.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 19 Jan 2013 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "AFPD" "8" "19 Jan 2013" "Netatalk 3.0" "Netatalk 3.0" +.TH "AFPD" "8" "19 Jan 2013" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -40,7 +40,7 @@ afpd \- Apple Filing Protocol daemon provides an Apple Filing Protocol (AFP) interface to the Unix file system\&. It is normally started at boot time by \fBnetatalk\fR(8)\&. .PP -:ETCDIR:/afp\&.conf +@pkgconfdir@/afp\&.conf is the configuration file used by \fBafpd\fR to determine the behavior and configuration of a file server\&. @@ -69,7 +69,7 @@ Print help and exit\&. \-F \fIconfigfile\fR .RS 4 Specifies the configuration file to use\&. (Defaults to -:ETCDIR:/afp\&.conf\&.) +@pkgconfdir@/afp\&.conf\&.) .RE .SH "SIGNALS" .PP @@ -136,27 +136,27 @@ process will look in the message directory configured at build time for a file n .RE .SH "FILES" .PP -:ETCDIR:/afp\&.conf +@pkgconfdir@/afp\&.conf .RS 4 configuration file used by afpd .RE .PP -:STATEDIR:/netatalk/afp_signature\&.conf +@localstatedir@/netatalk/afp_signature\&.conf .RS 4 list of server signature .RE .PP -:STATEDIR:/netatalk/afp_voluuid\&.conf +@localstatedir@/netatalk/afp_voluuid\&.conf .RS 4 list of UUID for Time Machine volume .RE .PP -:ETCDIR:/extmap\&.conf +@pkgconfdir@/extmap\&.conf .RS 4 file name extension mapping .RE .PP -:ETCDIR:/msg/message\&.pid +@pkgconfdir@/msg/message\&.pid .RS 4 contains messages to be sent to users\&. .RE diff --git a/man/man8/cnid_dbd.8.tmpl b/man/man8/cnid_dbd.8.in similarity index 98% rename from man/man8/cnid_dbd.8.tmpl rename to man/man8/cnid_dbd.8.in index b5d8bc5d..3b5b68a2 100644 --- a/man/man8/cnid_dbd.8.tmpl +++ b/man/man8/cnid_dbd.8.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 01 Jan 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "CNID_DBD" "8" "01 Jan 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "CNID_DBD" "8" "01 Jan 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/cnid_metad.8.tmpl b/man/man8/cnid_metad.8.in similarity index 93% rename from man/man8/cnid_metad.8.tmpl rename to man/man8/cnid_metad.8.in index 4007a7ca..0a0d559e 100644 --- a/man/man8/cnid_metad.8.tmpl +++ b/man/man8/cnid_metad.8.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 23 Mar 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "CNID_METAD" "8" "23 Mar 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "CNID_METAD" "8" "23 Mar 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -60,7 +60,7 @@ will also leave the standard input, standard output and standard error file desc Use \fIconfiguration file\fR as the configuration file\&. The default is -\fI:ETCDIR:/afp\&.conf\fR\&. +\fI@pkgconfdir@/afp\&.conf\fR\&. .RE .PP \fB\-v, \-V\fR diff --git a/man/man8/netatalk.8.tmpl b/man/man8/netatalk.8.in similarity index 91% rename from man/man8/netatalk.8.tmpl rename to man/man8/netatalk.8.in index 06878da5..39790ffc 100644 --- a/man/man8/netatalk.8.tmpl +++ b/man/man8/netatalk.8.in @@ -3,11 +3,11 @@ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.0 .\" Date: 22 Mar 2012 -.\" Manual: Netatalk 3.0 -.\" Source: Netatalk 3.0 +.\" Manual: @NETATALK_VERSION@ +.\" Source: @NETATALK_VERSION@ .\" Language: English .\" -.TH "NETATALK" "8" "22 Mar 2012" "Netatalk 3.0" "Netatalk 3.0" +.TH "NETATALK" "8" "22 Mar 2012" "@NETATALK_VERSION@" "@NETATALK_VERSION@" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -56,7 +56,7 @@ will cause the AFP daemon reload its configuration file\&. .RE .SH "FILES" .PP -:ETCDIR:/afp\&.conf +@pkgconfdir@/afp\&.conf .RS 4 configuration file used by afpd and cnid_metad .RE -- 2.39.2