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