From 5db499893160093c67c70e2bffbb986f3eaaf73b Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 29 Jun 2009 11:12:16 +0100 Subject: [PATCH] Move the client man pages from man/ to client/ --- Makefile.am | 1 - client/.gitignore | 2 ++ client/Makefile.am | 27 +++++++++++++++++++++++++++ {man => client}/pkcon.xml | 0 {man => client}/pkgenpack.xml | 0 {man => client}/pkmon.xml | 0 configure.ac | 1 - man/.gitignore | 4 ---- man/Makefile.am | 28 ---------------------------- 9 files changed, 29 insertions(+), 34 deletions(-) rename {man => client}/pkcon.xml (100%) rename {man => client}/pkgenpack.xml (100%) rename {man => client}/pkmon.xml (100%) delete mode 100644 man/.gitignore delete mode 100644 man/Makefile.am diff --git a/Makefile.am b/Makefile.am index f1d1d39aa..985dceaef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ SUBDIRS = \ po \ policy \ etc \ - man \ data \ lib \ src \ diff --git a/client/.gitignore b/client/.gitignore index 443b31d94..f2c54293a 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -12,4 +12,6 @@ pk-self-test *.gladep *.gladep.bak *.servicepack +manpage.* +*.1 diff --git a/client/Makefile.am b/client/Makefile.am index ccd24e492..57721257c 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -3,6 +3,31 @@ AUTOMAKE_OPTIONS = 1.7 NULL = +EXTRA_DIST = \ + pkcon.xml \ + pkmon.xml \ + pkgenpack.xml \ + $(NULL) + +if HAVE_XSLTPROC +man_MANS = \ + pkcon.1 \ + pkmon.1 \ + pkgenpack.1 \ + $(NULL) +endif + +if HAVE_XSLTPROC +pkcon.1: pkcon.xml + xsltproc http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $? &> /dev/null + +pkmon.1: pkmon.xml + xsltproc http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $? &> /dev/null + +pkgenpack.1: pkgenpack.xml + xsltproc http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $? &> /dev/null +endif + INCLUDES = \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ @@ -121,6 +146,8 @@ endif clean-local: rm -f *~ + rm -f *.1 + rm -f manpage.* rm -f *.out CLEANFILES = $(BUILT_SOURCES) diff --git a/man/pkcon.xml b/client/pkcon.xml similarity index 100% rename from man/pkcon.xml rename to client/pkcon.xml diff --git a/man/pkgenpack.xml b/client/pkgenpack.xml similarity index 100% rename from man/pkgenpack.xml rename to client/pkgenpack.xml diff --git a/man/pkmon.xml b/client/pkmon.xml similarity index 100% rename from man/pkmon.xml rename to client/pkmon.xml diff --git a/configure.ac b/configure.ac index 8a19e964d..cfa8b80da 100644 --- a/configure.ac +++ b/configure.ac @@ -704,7 +704,6 @@ dnl --------------------------------------------------------------------------- AC_OUTPUT([ Makefile etc/Makefile -man/Makefile docs/Makefile docs/html/Makefile docs/html/img/Makefile diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index b88437c9f..000000000 --- a/man/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -manpage.links -manpage.refs -*.1 - diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index ecb50bc18..000000000 --- a/man/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -EXTRA_DIST = \ - pkcon.xml \ - pkmon.xml \ - pkgenpack.xml - -if HAVE_XSLTPROC -man_MANS = \ - pkcon.1 \ - pkmon.1 \ - pkgenpack.1 -endif - -if HAVE_XSLTPROC -pkcon.1: pkcon.xml - xsltproc http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $? &> /dev/null - -pkmon.1: pkmon.xml - xsltproc http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $? &> /dev/null - -pkgenpack.1: pkgenpack.xml - xsltproc http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $? &> /dev/null -endif - -clean-local : - rm -f *~ - rm -f *.1 - rm -f manpage.* -