update python stuff a little to match the newest DBUS interfaces

[catta] / man / Makefile.am

diff --git a/man/Makefile.am b/man/Makefile.am
index d253ddb487616b44df9213e4229aa685c5388d2a..d80c88573f57d581ba260f6477dadd85a011566f 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -20,6 +20,8 @@
 pkgsysconfdir=$(sysconfdir)/avahi
 servicedir=$(pkgsysconfdir)/services
 
+if BUILD_MANPAGES
+
 man_MANS = \
        avahi-daemon.8 \
        avahi-dnsconfd.8 \
@@ -27,19 +29,6 @@ man_MANS = \
        avahi-dnsconfd.action.8 \
        avahi.service.5
 
-if HAVE_PYTHON
-
-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
-
 noinst_DATA = \
        avahi-browse.1.xml \
        avahi-publish-service.1.xml \
@@ -54,27 +43,24 @@ noinst_DATA = \
        avahi-dnsconfd.action.8.xml \
        avahi.service.5.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 \
-       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
-
 CLEANFILES = \
        $(noinst_DATA)
 
+if HAVE_PYTHON
+if HAVE_DBUS
+
+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
+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' $< > $@
@@ -178,3 +164,23 @@ xmllint: $(noinst_DATA)
        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-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 \
+       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