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