man page install fixes

[catta] / man / Makefile.am

diff --git a/man/Makefile.am b/man/Makefile.am
index 885f9d8c8a1ecf43a2acfd79b25363b23b1bae3b..ae8302402714d56d0d7f9b5be965e628f5f52fa4 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -20,49 +20,46 @@
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
 
-man_MANS = \
-       avahi-daemon.8
-
-if HAVE_PYTHON
+if BUILD_MANPAGES
 
-man_MANS += \
-       avahi-browse.1 \
-       avahi-publish-service.1 \
-       avahi-publish-address.1 \
-       avahi-resolve-address.1 \
-       avahi-resolve-host-name.1 \
-       avahi-discover.1 \
-       avahi-bookmarks.1
-
-endif
+man_MANS = \
+       avahi-daemon.8 \
+       avahi-dnsconfd.8 \
+       avahi-daemon.conf.5 \
+       avahi-dnsconfd.action.8 \
+       avahi.service.5
 
 noinst_DATA = \
        avahi-browse.1.xml \
        avahi-publish-service.1.xml \
        avahi-publish-address.1.xml \
-       avahi-resolve-address.1.xml \
-       avahi-resolve-host-name.1.xml \
+       avahi-resolve.1.xml \
        avahi-daemon.8.xml \
        avahi-discover.1.xml \
-       avahi-bookmarks.1.xml
-
-EXTRA_DIST = \
-       $(man_MANS) \
-       avahi-browse.1.xml.in \
-       avahi-publish-service.1.xml.in \
-       avahi-publish-address.1.xml.in \
-       avahi-resolve-address.1.xml.in \
-       avahi-resolve-host-name.1.xml.in \
-       avahi-daemon.8.xml.in \
-       avahi-discover.1.xml.in \
-       avahi-bookmarks.1.xml.in \
-       xmltoman.css \
-       xmltoman.xsl \
-       xmltoman.dtd
+       avahi-bookmarks.1.xml \
+       avahi-dnsconfd.8.xml \
+       avahi-daemon.conf.5.xml \
+       avahi-dnsconfd.action.8.xml \
+       avahi.service.5.xml
 
 CLEANFILES = \
        $(noinst_DATA)
 
+if HAVE_DBUS
+
+man_MANS += \
+       avahi-browse.1 \
+       avahi-resolve.1
+
+if HAVE_PYTHON
+man_MANS += \
+       avahi-publish-service.1 \
+       avahi-publish-address.1 \
+       avahi-discover.1 \
+       avahi-bookmarks.1
+endif
+endif
+
 avahi-browse.1.xml: avahi-browse.1.xml.in Makefile
        sed -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
         -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
@@ -75,11 +72,7 @@ avahi-publish-address.1.xml: avahi-publish-address.1.xml.in Makefile
        sed     -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
         -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
 
-avahi-resolve-address.1.xml: avahi-resolve-address.1.xml.in Makefile
-       sed     -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
-        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
-
-avahi-resolve-host-name.1.xml: avahi-resolve-host-name.1.xml.in Makefile
+avahi-resolve.1.xml: avahi-resolve.1.xml.in Makefile
        sed     -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
         -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
 
@@ -97,6 +90,28 @@ avahi-bookmarks.1.xml: avahi-bookmarks.1.xml.in Makefile
        sed     -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
         -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
 
+avahi-dnsconfd.8.xml: avahi-dnsconfd.8.xml.in Makefile
+       sed     -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+               -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
+        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
+
+avahi-daemon.conf.5.xml: avahi-daemon.conf.5.xml.in Makefile
+       sed     -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+               -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
+        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
+
+avahi-dnsconfd.action.8.xml: avahi-dnsconfd.action.8.xml.in Makefile
+       sed     -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+               -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
+        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
+
+avahi.service.5.xml: avahi.service.5.xml.in Makefile
+       sed     -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+               -e 's,@servicedir\@,$(servicedir),g' \
+               -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
+        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
+
+
 if USE_XMLTOMAN
 
 CLEANFILES += $(man_MANS)
@@ -110,10 +125,7 @@ avahi-publish-service.1: avahi-publish-service.1.xml Makefile
 avahi-publish-address.1: avahi-publish-address.1.xml Makefile
        xmltoman $< > $@
 
-avahi-resolve-address.1: avahi-resolve-address.1.xml Makefile
-       xmltoman $< > $@
-
-avahi-resolve-host-name.1: avahi-resolve-host-name.1.xml Makefile
+avahi-resolve.1: avahi-resolve.1.xml Makefile
        xmltoman $< > $@
 
 avahi-daemon.8: avahi-daemon.8.xml Makefile
@@ -125,4 +137,54 @@ avahi-discover.1: avahi-discover.1.xml Makefile
 avahi-bookmarks.1: avahi-bookmarks.1.xml Makefile
        xmltoman $< > $@
 
+avahi-dnsconfd.8: avahi-dnsconfd.8.xml Makefile
+       xmltoman $< > $@
+
+avahi-daemon.conf.5: avahi-daemon.conf.5.xml Makefile
+       xmltoman $< > $@
+
+avahi-dnsconfd.action.8: avahi-dnsconfd.action.8.xml Makefile
+       xmltoman $< > $@
+
+avahi.service.5: avahi.service.5.xml Makefile
+       xmltoman $< > $@
+
+
+xmllint: $(noinst_DATA)
+       for f in $(noinst_DATA) ; do \
+                       xmllint --noout --valid "$$f" || exit 1 ; \
+       done
+
+endif
+
+endif
+
+EXTRA_DIST = \
+       $(man_MANS) \
+       avahi-browse.1.xml.in \
+       avahi-publish-service.1.xml.in \
+       avahi-publish-address.1.xml.in \
+       avahi-resolve.1.xml.in \
+       avahi-daemon.8.xml.in \
+       avahi-discover.1.xml.in \
+       avahi-bookmarks.1.xml.in \
+       avahi-dnsconfd.8.xml.in \
+       avahi-daemon.conf.5.xml.in \
+       avahi-dnsconfd.action.8.xml.in \
+       avahi.service.5.xml.in \
+       xmltoman.css \
+       xmltoman.xsl \
+       xmltoman.dtd
+
+
+if HAVE_DBUS
+
+install-exec-local:
+       mkdir -p $(DESTDIR)/$(mandir)/man1 && \
+               cd $(DESTDIR)/$(mandir)/man1 && \
+               rm -f avahi-resolve-host-name.1 avahi-resolve-address.1 avahi-browse-domains.1 && \
+               $(LN_S) avahi-resolve.1 avahi-resolve-host-name.1 && \
+               $(LN_S) avahi-resolve.1 avahi-resolve-address.1 && \
+               $(LN_S) avahi-browse.1 avahi-browse-domains.1
+
 endif