a2a915
From e462d022a9dc52c40aece6f8ba3123ff3ffa59ed Mon Sep 17 00:00:00 2001
a2a915
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
a2a915
Date: Wed, 25 Jul 2018 12:24:16 +0200
a2a915
Subject: [PATCH] Use make automatic variables to install updated manuals
a2a915
a2a915
Make will choose modified manual from build directory or original from source
a2a915
directory automagically. Take advantage of install tool feature.
a2a915
Install all files in single command instead of iterating on each of them.
a2a915
---
a2a915
 bin/check/Makefile.in   |  8 +++++---
a2a915
 bin/confgen/Makefile.in |  9 +++++----
a2a915
 bin/delv/Makefile.in    |  6 ++++--
a2a915
 bin/dig/Makefile.in     |  8 ++++----
a2a915
 bin/dnssec/Makefile.in  |  6 ++++--
a2a915
 bin/named/Makefile.in   | 13 +++++++++----
a2a915
 bin/pkcs11/Makefile.in  |  9 ++++-----
a2a915
 bin/python/Makefile.in  |  8 ++++----
a2a915
 bin/tools/Makefile.in   | 25 +++++++++++++++----------
a2a915
 9 files changed, 54 insertions(+), 38 deletions(-)
a2a915
a2a915
diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
a2a915
index 12f48d2d23..d8eac4c714 100644
a2a915
--- a/bin/check/Makefile.in
a2a915
+++ b/bin/check/Makefile.in
a2a915
@@ -83,12 +83,14 @@ installdirs:
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
a2a915
 
a2a915
-install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs
a2a915
+install-man8: ${MANPAGES}
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
a2a915
+	(cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8)
a2a915
+
a2a915
+install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs install-man8
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkconf@EXEEXT@ ${DESTDIR}${sbindir}
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-checkzone@EXEEXT@ ${DESTDIR}${sbindir}
a2a915
 	(cd ${DESTDIR}${sbindir}; rm -f named-compilezone@EXEEXT@; ${LINK_PROGRAM} named-checkzone@EXEEXT@ named-compilezone@EXEEXT@)
a2a915
-	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
a2a915
-	(cd ${DESTDIR}${mandir}/man8; rm -f named-compilezone.8; ${LINK_PROGRAM} named-checkzone.8 named-compilezone.8)
a2a915
 
a2a915
 uninstall::
a2a915
 	rm -f ${DESTDIR}${mandir}/man8/named-compilezone.8
a2a915
diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
a2a915
index 87f13dda4b..7865c0c73e 100644
a2a915
--- a/bin/confgen/Makefile.in
a2a915
+++ b/bin/confgen/Makefile.in
a2a915
@@ -95,13 +95,14 @@ installdirs:
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
a2a915
 
a2a915
-install:: rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ installdirs
a2a915
+install-man8: rndc-confgen.8 ddns-confgen.8
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
a2a915
+	(cd ${DESTDIR}${mandir}/man8; rm -f tsig-keygen.8; ${LINK_PROGRAM} ddns-confgen.8 tsig-keygen.8)
a2a915
+
a2a915
+install:: rndc-confgen@EXEEXT@ ddns-confgen@EXEEXT@ installdirs install-man8
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} rndc-confgen@EXEEXT@ ${DESTDIR}${sbindir}
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} ddns-confgen@EXEEXT@ ${DESTDIR}${sbindir}
a2a915
-	${INSTALL_DATA} ${srcdir}/rndc-confgen.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/ddns-confgen.8 ${DESTDIR}${mandir}/man8
a2a915
 	(cd ${DESTDIR}${sbindir}; rm -f tsig-keygen@EXEEXT@; ${LINK_PROGRAM} ddns-confgen@EXEEXT@ tsig-keygen@EXEEXT@)
a2a915
-	(cd ${DESTDIR}${mandir}/man8; rm -f tsig-keygen.8; ${LINK_PROGRAM} ddns-confgen.8 tsig-keygen.8)
a2a915
 
a2a915
 uninstall::
a2a915
 	rm -f ${DESTDIR}${mandir}/man8/tsig-keygen.8
a2a915
diff --git a/bin/delv/Makefile.in b/bin/delv/Makefile.in
a2a915
index e2d2802262..19361a83ea 100644
a2a915
--- a/bin/delv/Makefile.in
a2a915
+++ b/bin/delv/Makefile.in
a2a915
@@ -63,10 +63,12 @@ installdirs:
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
a2a915
 
a2a915
-install:: delv@EXEEXT@ installdirs
a2a915
+install-man1: delv.1
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
a2a915
+
a2a915
+install:: delv@EXEEXT@ installdirs install-man1
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
a2a915
 		delv@EXEEXT@ ${DESTDIR}${bindir}
a2a915
-	${INSTALL_DATA} ${srcdir}/delv.1 ${DESTDIR}${mandir}/man1
a2a915
 
a2a915
 uninstall::
a2a915
 	rm -f ${DESTDIR}${mandir}/man1/delv.1
a2a915
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
a2a915
index 773ac46395..3edd951e7e 100644
a2a915
--- a/bin/dig/Makefile.in
a2a915
+++ b/bin/dig/Makefile.in
a2a915
@@ -91,16 +91,16 @@ installdirs:
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
a2a915
 
a2a915
-install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs
a2a915
+install-man1: ${MANPAGES}
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
a2a915
+
a2a915
+install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs install-man1
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
a2a915
 		dig@EXEEXT@ ${DESTDIR}${bindir}
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
a2a915
 		host@EXEEXT@ ${DESTDIR}${bindir}
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
a2a915
 		nslookup@EXEEXT@ ${DESTDIR}${bindir}
a2a915
-	for m in ${MANPAGES}; do \
a2a915
-		${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1; \
a2a915
-		done
a2a915
 
a2a915
 uninstall::
a2a915
 	for m in ${MANPAGES}; do \
a2a915
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
a2a915
index 1be1d5ffc6..1d0c4ce5c1 100644
a2a915
--- a/bin/dnssec/Makefile.in
a2a915
+++ b/bin/dnssec/Makefile.in
a2a915
@@ -110,9 +110,11 @@ installdirs:
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
a2a915
 
a2a915
-install:: ${TARGETS} installdirs
a2a915
+install-man8: ${MANPAGES}
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
a2a915
+
a2a915
+install:: ${TARGETS} installdirs install-man8
a2a915
 	for t in ${TARGETS}; do ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} $$t ${DESTDIR}${sbindir}; done
a2a915
-	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
a2a915
 
a2a915
 uninstall::
a2a915
 	for m in ${MANPAGES}; do rm -f ${DESTDIR}${mandir}/man8/$$m ; done
a2a915
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
a2a915
index 1c413973d0..03e4cb849b 100644
a2a915
--- a/bin/named/Makefile.in
a2a915
+++ b/bin/named/Makefile.in
a2a915
@@ -172,12 +172,17 @@ installdirs:
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
a2a915
 
a2a915
-install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
a2a915
+install-man5: named.conf.5
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man5
a2a915
+
a2a915
+install-man8: named.8 lwresd.8
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
a2a915
+
a2a915
+install-man: install-man5 install-man8
a2a915
+
a2a915
+install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs install-man
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
a2a915
 	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
a2a915
-	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
a2a915
 
a2a915
 uninstall::
a2a915
 	rm -f ${DESTDIR}${mandir}/man5/named.conf.5
a2a915
diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in
a2a915
index ae9061626c..a058c91214 100644
a2a915
--- a/bin/pkcs11/Makefile.in
a2a915
+++ b/bin/pkcs11/Makefile.in
a2a915
@@ -71,7 +71,10 @@ installdirs:
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
a2a915
 
a2a915
-install:: ${TARGETS} installdirs
a2a915
+install-man8: ${MANPAGES}
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
a2a915
+
a2a915
+install:: ${TARGETS} installdirs install-man8
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-list@EXEEXT@ \
a2a915
 		${DESTDIR}${sbindir}
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-destroy@EXEEXT@ \
a2a915
@@ -80,10 +83,6 @@ install:: ${TARGETS} installdirs
a2a915
 		${DESTDIR}${sbindir}
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} pkcs11-tokens@EXEEXT@ \
a2a915
 		${DESTDIR}${sbindir}
a2a915
-	${INSTALL_DATA} ${srcdir}/pkcs11-list.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/pkcs11-destroy.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/pkcs11-keygen.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/pkcs11-tokens.8 ${DESTDIR}${mandir}/man8
a2a915
 
a2a915
 uninstall::
a2a915
 	rm -f ${DESTDIR}${mandir}/man8/pkcs11-tokens.8
a2a915
diff --git a/bin/python/Makefile.in b/bin/python/Makefile.in
a2a915
index aa678d47ab..064c404e2f 100644
a2a915
--- a/bin/python/Makefile.in
a2a915
+++ b/bin/python/Makefile.in
a2a915
@@ -47,13 +47,13 @@ installdirs:
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
a2a915
 
a2a915
-install:: ${TARGETS} installdirs
a2a915
+install-man8: ${MANPAGES}
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
a2a915
+
a2a915
+install:: ${TARGETS} installdirs install-man8
a2a915
 	${INSTALL_SCRIPT} dnssec-checkds ${DESTDIR}${sbindir}
a2a915
 	${INSTALL_SCRIPT} dnssec-coverage ${DESTDIR}${sbindir}
a2a915
 	${INSTALL_SCRIPT} dnssec-keymgr ${DESTDIR}${sbindir}
a2a915
-	${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/dnssec-keymgr.8 ${DESTDIR}${mandir}/man8
a2a915
 	if test -n "${PYTHON}" ; then \
a2a915
 		if test -n "${DESTDIR}" ; then \
a2a915
 			${PYTHON} ${srcdir}/setup.py install --root=${DESTDIR} --prefix=${prefix} @PYTHON_INSTALL_LIB@ ; \
a2a915
diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
a2a915
index 7bf2af4cea..c395bc7462 100644
a2a915
--- a/bin/tools/Makefile.in
a2a915
+++ b/bin/tools/Makefile.in
a2a915
@@ -119,17 +119,27 @@ installdirs:
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
a2a915
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
a2a915
 
a2a915
-nzd:
a2a915
+nzd-man: named-nzd2nzf.8
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
a2a915
+
a2a915
+nzd: nzd-man
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-nzd2nzf@EXEEXT@ \
a2a915
 		${DESTDIR}${sbindir}
a2a915
-	${INSTALL_DATA} ${srcdir}/named-nzd2nzf.8 ${DESTDIR}${mandir}/man8
a2a915
 
a2a915
-dnstap:
a2a915
+dnstap-man: dnstap-read.1
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
a2a915
+
a2a915
+dnstap: dnstap-man
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} dnstap-read@EXEEXT@ \
a2a915
 		${DESTDIR}${bindir}
a2a915
-	${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1
a2a915
 
a2a915
-install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
a2a915
+install-man1: arpaname.1 named-rrchecker.1 mdig.1
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man1
a2a915
+
a2a915
+install-man8: named-journalprint.8 nsec3hash.8
a2a915
+	${INSTALL_DATA} $^ ${DESTDIR}${mandir}/man8
a2a915
+
a2a915
+install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@ install-man1 install-man8
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \
a2a915
 		${DESTDIR}${bindir}
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \
a2a915
@@ -144,13 +154,8 @@ install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
a2a915
 		${DESTDIR}${sbindir}
a2a915
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \
a2a915
 		${DESTDIR}${bindir}
a2a915
-	${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
a2a915
 	${INSTALL_DATA} ${srcdir}/isc-hmac-fixup.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1
a2a915
-	${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8
a2a915
 	${INSTALL_DATA} ${srcdir}/genrandom.8 ${DESTDIR}${mandir}/man8
a2a915
-	${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1
a2a915
 
a2a915
 uninstall::
a2a915
 	rm -f ${DESTDIR}${mandir}/man1/mdig.1
a2a915
-- 
a2a915
2.14.4
a2a915