reword avahi.service man page to state that a unicast DNS name is OK in static services

[catta] / man / Makefile.am

diff --git a/man/Makefile.am b/man/Makefile.am
index d80c88573f57d581ba260f6477dadd85a011566f..f16e8e1ac1113cb406fd968b337b8c5fd6efd451 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,10 +31,8 @@ man_MANS = \
 
 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-publish.1.xml \
+       avahi-resolve.1.xml \
        avahi-daemon.8.xml \
        avahi-discover.1.xml \
        avahi-bookmarks.1.xml \
@@ -46,18 +44,17 @@ noinst_DATA = \
 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-resolve.1 \
+       avahi-publish.1
+
+if HAVE_PYTHON
+man_MANS += \
        avahi-discover.1 \
        avahi-bookmarks.1
-
 endif
 endif
 
@@ -65,19 +62,11 @@ 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' $< > $@
 
-avahi-publish-service.1.xml: avahi-publish-service.1.xml.in Makefile
-       sed     -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
-        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' $< > $@
-
-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
+avahi-publish.1.xml: avahi-publish.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' $< > $@
 
@@ -124,16 +113,10 @@ CLEANFILES += $(man_MANS)
 avahi-browse.1: avahi-browse.1.xml Makefile
        xmltoman $< > $@
 
-avahi-publish-service.1: avahi-publish-service.1.xml Makefile
+avahi-publish.1: avahi-publish.1.xml Makefile
        xmltoman $< > $@
 
-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
@@ -170,10 +153,8 @@ 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-publish.1.xml.in \
+       avahi-resolve.1.xml.in \
        avahi-daemon.8.xml.in \
        avahi-discover.1.xml.in \
        avahi-bookmarks.1.xml.in \
@@ -184,3 +165,18 @@ EXTRA_DIST = \
        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 avahi-publish-address.1 avahi-publish-service.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 && \
+               $(LN_S) avahi-publish.1 avahi-publish-address.1 && \
+               $(LN_S) avahi-publish.1 avahi-publish-service.1
+
+endif