[#2071] fixed rebase

diff --git a/src/bin/agent/ca_process.cc b/src/bin/agent/ca_process.cc
index 8c47377a781c3d747d235e131addf1459f5956a8..1fad8db9b4e6f919b88328e38654299cf3c1ba85 100644 (file)
--- a/src/bin/agent/ca_process.cc
+++ b/src/bin/agent/ca_process.cc
@@ -197,7 +197,7 @@ void
 CtrlAgentProcess::garbageCollectListeners(size_t leaving) {
     // We expect only one active listener. If there are more (most likely 2),
     // it means we have just reconfigured the server and need to shut down all
-    // listeners execept the most recently added.
+    // listeners except the most recently added.
     if (http_listeners_.size() > leaving) {
         // Stop no longer used listeners.
         for (auto l = http_listeners_.begin();

diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
index ca9f255726953ea48f41e9a5a12b0aa6a3419843..aee58bdebb6a39175fe6c1a7d82e374eef0ffb34 100644 (file)
--- a/src/bin/keactrl/Makefile.am
+++ b/src/bin/keactrl/Makefile.am
@@ -3,8 +3,10 @@ SUBDIRS = . tests
 # Install keactrl in sbin and the keactrl.conf required by the keactrl
 # in etc. keactrl will look for its configuration file in the etc folder.
 sbin_SCRIPTS  = keactrl
-KEA_CONFIGFILES = \
-       kea-dhcp4.conf kea-dhcp6.conf kea-dhcp-ddns.conf kea-ctrl-agent.conf
+KEA_CONFIGFILES = kea-dhcp4.conf
+KEA_CONFIGFILES += kea-dhcp6.conf
+KEA_CONFIGFILES += kea-dhcp-ddns.conf
+KEA_CONFIGFILES += kea-ctrl-agent.conf
 
 if HAVE_SYSREPO
 KEA_CONFIGFILES += kea-netconf.conf
@@ -14,10 +16,13 @@ CONFIGFILES = keactrl.conf $(KEA_CONFIGFILES)
 
 DISTCLEANFILES = keactrl keactrl.conf
 CLEANFILES = $(KEA_CONFIGFILES)
-EXTRA_DIST = \
-       keactrl.in keactrl.conf.in kea-dhcp4.conf.pre \
-       kea-dhcp6.conf.pre kea-dhcp-ddns.conf.pre \
-       kea-ctrl-agent.conf.pre kea-netconf.conf.pre
+EXTRA_DIST = keactrl.in
+EXTRA_DIST += keactrl.conf.in
+EXTRA_DIST += kea-dhcp4.conf.pre
+EXTRA_DIST += kea-dhcp6.conf.pre
+EXTRA_DIST += kea-dhcp-ddns.conf.pre
+EXTRA_DIST += kea-ctrl-agent.conf.pre
+EXTRA_DIST += kea-netconf.conf.pre
 
 # *.conf files are not really sources used for building other targets, but we need
 # these files to be generated before make install is called.

diff --git a/src/lib/hooks/tests/Makefile.am b/src/lib/hooks/tests/Makefile.am
index dea7f4e41d0a2256613b8f68d735dbf320b6d082..f0f5b048f5375b478d55b5d6ef8f0d773536788a 100644 (file)
--- a/src/lib/hooks/tests/Makefile.am
+++ b/src/lib/hooks/tests/Makefile.am
@@ -37,9 +37,8 @@ if HAVE_GTEST
 # to unexpected errors. For this reason, the --enable-static-link option is
 # ignored for unit tests built here.
 
-noinst_LTLIBRARIES = \
-       libnvl.la  libivl.la libfxl.la libbcl.la liblcl.la \
-       liblecl.la libucl.la libfcl.la libpcl.la libacl.la
+noinst_LTLIBRARIES = libnvl.la libivl.la libfxl.la libbcl.la liblcl.la
+noinst_LTLIBRARIES += liblecl.la libucl.la libfcl.la libpcl.la libacl.la
 
 # -rpath /nowhere is a hack to trigger libtool to not create a
 # convenience archive, resulting in shared modules

diff --git a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
index b442ef3bfe1937354df368d129ba786f89cebde0..82c3ff51384830fef4855da1863393ef054cb049 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_013_to_014.sh.in
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
+    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi

diff --git a/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in b/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
index 00a02dcea2e18dc3f408d63c78cb5124b1f7078e..e7ab2c316eca1f8672769570900917976a199e40 100644 (file)
--- a/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in
@@ -19,8 +19,8 @@ prefix="@prefix@"
 
 # Include utilities. Use installed version if available and
 # use build version if it isn't.
-if [ -e @datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh ]; then
-    . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
+if [ -e "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" ]; then
+    . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh"
 else
     . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
 fi