From: Francis Dupont <fdupont@isc.org>
Date: Fri, 15 Feb 2019 14:24:24 +0000 (+0100)
Subject: [161-move-hooks-subdirectory-under-kea-own-directory] Merged MR 70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=511a24bb86d87d25f8e69768081817aaaad6b593;p=thirdparty%2Fkea.git

[161-move-hooks-subdirectory-under-kea-own-directory] Merged MR 70
---

diff --git a/configure.ac b/configure.ac
index 1b872cb8cc..5d9486839e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1753,7 +1753,7 @@ Package:
   Extended version:  ${EXTENDED_VERSION}
   OS Family:         ${OS_TYPE}
 
-  Hooks directory:   ${prefix}/lib/hooks
+  Hooks directory:   ${libdir}/kea/hooks
 END
 if test "$PREMIUM" != ""; then
 cat >> config.report << END
diff --git a/src/hooks/dhcp/high_availability/Makefile.am b/src/hooks/dhcp/high_availability/Makefile.am
index 8550cca815..ffba51caa0 100644
--- a/src/hooks/dhcp/high_availability/Makefile.am
+++ b/src/hooks/dhcp/high_availability/Makefile.am
@@ -43,8 +43,8 @@ nodist_libha_la_SOURCES = ha_messages.cc ha_messages.h
 libha_la_CXXFLAGS = $(AM_CXXFLAGS)
 libha_la_CPPFLAGS = $(AM_CPPFLAGS)
 
-# install the shared object into $(libdir)/hooks
-lib_hooksdir = $(libdir)/hooks
+# install the shared object into $(libdir)/kea/hooks
+lib_hooksdir = $(libdir)/kea/hooks
 lib_hooks_LTLIBRARIES = libdhcp_ha.la
 
 libdhcp_ha_la_SOURCES  =
diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am
index 841298f4bc..d32825540c 100644
--- a/src/hooks/dhcp/lease_cmds/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/Makefile.am
@@ -36,8 +36,8 @@ nodist_liblease_cmds_la_SOURCES = lease_cmds_messages.cc lease_cmds_messages.h
 liblease_cmds_la_CXXFLAGS = $(AM_CXXFLAGS)
 liblease_cmds_la_CPPFLAGS = $(AM_CPPFLAGS)
 
-# install the shared object into $(libdir)/hooks
-lib_hooksdir = $(libdir)/hooks
+# install the shared object into $(libdir)/kea/hooks
+lib_hooksdir = $(libdir)/kea/hooks
 lib_hooks_LTLIBRARIES = libdhcp_lease_cmds.la
 
 libdhcp_lease_cmds_la_SOURCES  =
diff --git a/src/hooks/dhcp/stat_cmds/Makefile.am b/src/hooks/dhcp/stat_cmds/Makefile.am
index e6ff587cf6..ccfc3adeef 100644
--- a/src/hooks/dhcp/stat_cmds/Makefile.am
+++ b/src/hooks/dhcp/stat_cmds/Makefile.am
@@ -35,8 +35,8 @@ nodist_libstat_cmds_la_SOURCES = stat_cmds_messages.cc stat_cmds_messages.h
 libstat_cmds_la_CXXFLAGS = $(AM_CXXFLAGS)
 libstat_cmds_la_CPPFLAGS = $(AM_CPPFLAGS)
 
-# install the shared object into $(libdir)/hooks
-lib_hooksdir = $(libdir)/hooks
+# install the shared object into $(libdir)/kea/hooks
+lib_hooksdir = $(libdir)/kea/hooks
 lib_hooks_LTLIBRARIES = libdhcp_stat_cmds.la
 
 libdhcp_stat_cmds_la_SOURCES  =