X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=man%2FMakefile.am;h=ae8302402714d56d0d7f9b5be965e628f5f52fa4;hb=1142df7d48735965a3dba8e95093001936d77bd6;hp=d80c88573f57d581ba260f6477dadd85a011566f;hpb=a26b065238debb81e25106b573addb323e529bce;p=catta

diff --git a/man/Makefile.am b/man/Makefile.am
index d80c885..ae83024 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -33,8 +33,7 @@ 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 \
@@ -46,18 +45,18 @@ noinst_DATA = \
 CLEANFILES = \
 	$(noinst_DATA)
 
-if HAVE_PYTHON
 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-resolve-address.1 \
-	avahi-resolve-host-name.1 \
 	avahi-discover.1 \
 	avahi-bookmarks.1
-
 endif
 endif
 
@@ -73,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' $< > $@
 
@@ -130,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
@@ -172,8 +164,7 @@ EXTRA_DIST = \
 	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-resolve.1.xml.in \
 	avahi-daemon.8.xml.in \
 	avahi-discover.1.xml.in \
 	avahi-bookmarks.1.xml.in \
@@ -184,3 +175,16 @@ 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 && \
+		$(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