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.

(cherry picked from commit c527b7fd5c583ace1921117fc1580fe1bbde8e02)

diff --git a/bin/plugins/Makefile.in b/bin/plugins/Makefile.in
index c6c8a915ad24b1c065457340f95b5787631360f0..0e061e7796485482f3d183bc77c2c7e4ea9891df 100644 (file)
--- 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 5cc4a4e67d39b09b1aa3c95a336cafcbc59d1084..80398564892b71e6c82b4ad195a8f73709141d46 100644 (file)
--- a/make/rules.in
+++ b/make/rules.in
@@ -28,6 +28,8 @@ localstatedir =       @localstatedir@
 mandir =       @mandir@
 datarootdir =   @datarootdir@
 
+plugindir =    ${libdir}/named
+
 DESTDIR =
 
 @SET_MAKE@