From c527b7fd5c583ace1921117fc1580fe1bbde8e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Tue, 12 Feb 2019 15:59:54 +0100
Subject: [PATCH] Install named plugins into a separate directory

Installing named plugins into ${libdir} clutters the latter and is not
in line with common filesystem conventions.  Instead, install named
plugins into a separate directory, ${libdir}/named.
---
 bin/plugins/Makefile.in | 6 +++---
 make/rules.in           | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/plugins/Makefile.in b/bin/plugins/Makefile.in
index c6c8a915ad..0e061e7796 100644
--- a/bin/plugins/Makefile.in
+++ b/bin/plugins/Makefile.in
@@ -59,14 +59,14 @@ clean distclean::
 	rm -f ${TARGETS} ${OBJS}
 
 installdirs:
-	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${plugindir}
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: filter-aaaa.@SO@ installdirs
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} filter-aaaa.@SO@ \
-		${DESTDIR}${libdir}
+		${DESTDIR}${plugindir}
 	${INSTALL_DATA} ${srcdir}/filter-aaaa.8 ${DESTDIR}${mandir}/man8
 
 uninstall::
-	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${libdir}/filter-aaaa.@SO@
+	${LIBTOOL_MODE_UNINSTALL} rm -f ${DESTDIR}${plugindir}/filter-aaaa.@SO@
 	rm -f ${DESTDIR}${mandir}/man8/filter-aaaa.8
diff --git a/make/rules.in b/make/rules.in
index 5cc4a4e67d..8039856489 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -28,6 +28,8 @@ localstatedir =	@localstatedir@
 mandir =	@mandir@
 datarootdir =   @datarootdir@
 
+plugindir =	${libdir}/named
+
 DESTDIR =
 
 @SET_MAKE@