Finish renaming

NTmatter · May 14, 2013 · 078278c · 078278c
1 parent 2f743cb
commit 078278c
Show file tree

Hide file tree

Showing 38 changed files with 212 additions and 220 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
 Makefile.in
 Makefile
-.gitignore
-*.o
+html.xsl
+man.xsl
diff --git 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 = @[email protected]
 
-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
@@ -0,0 +1 @@
+SUBDIRS = man1 man5 man8
diff --git a/doc/manpages/man1/.gitignore b/doc/manpages/man1/.gitignore
@@ -0,0 +1 @@
+*\.1
diff --git a/doc/manpages/man1/Makefile.am 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
@@ -0,0 +1 @@
+*\.5
diff --git a/doc/manpages/man5/Makefile.am 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
@@ -0,0 +1 @@
+*\.8
diff --git a/doc/manpages/man8/Makefile.am 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
@@ -0,0 +1 @@
+manual.xml
diff --git 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
@@ -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
@@ -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 → man/man1/ad.1.in b/man/man1/ad.1 → 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 <http://docbook.sf.net/>
 .\"      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 → man/man1/afpldaptest.1.in b/man/man1/afpldaptest.1.tmpl → 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 <http://docbook.sf.net/>
 .\"      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 → man/man1/afppasswd.1.in b/man/man1/afppasswd.1 → 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 <http://docbook.sf.net/>
 .\"      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 → man/man1/afpstats.1.in b/man/man1/afpstats.1.tmpl → 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 <http://docbook.sf.net/>
 .\"      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 → man/man1/apple_dump.1.in b/man/man1/apple_dump.1 → 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 <http://docbook.sf.net/>
 .\"      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 → man/man1/asip-status.pl.1.in b/man/man1/asip-status.pl.1.tmpl → 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 <http://docbook.sf.net/>
 .\"      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 → man/man1/dbd.1.in b/man/man1/dbd.1 → 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 <http://docbook.sf.net/>
 .\"      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 → man/man1/macusers.1.in b/man/man1/macusers.1 → 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 <http://docbook.sf.net/>
 .\"      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 → man/man1/megatron.1.in b/man/man1/megatron.1 → 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 <http://docbook.sf.net/>
 .\"      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 → man/man1/netatalk-config.1.in b/man/man1/netatalk-config.1 → man/man1/netatalk-config.1.in
@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
 .\"      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
 .\" -----------------------------------------------------------------