From: Andrei Pavel <andrei@isc.org>
Date: Wed, 17 Feb 2021 11:28:50 +0000 (+0200)
Subject: [#1681] fix database scripts being installed twice
X-Git-Tag: Kea-1.9.5~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6edf517b2016aba9127565cf9739b4176a657b;p=thirdparty%2Fkea.git

[#1681] fix database scripts being installed twice

which is unnecessary, but would also result in a race condition if
make-installed on multiple threads wich might also be the default on
some systems
---

diff --git a/src/share/database/scripts/cql/Makefile.am b/src/share/database/scripts/cql/Makefile.am
index acdf2c3326..4f229d6df0 100644
--- a/src/share/database/scripts/cql/Makefile.am
+++ b/src/share/database/scripts/cql/Makefile.am
@@ -1,18 +1,20 @@
 SUBDIRS = .
 
-UPGRADESCRIPTS =
-UPGRADESCRIPTS += upgrade_1.0_to_2.0.sh
-UPGRADESCRIPTS += upgrade_2.0_to_3.0.sh
-UPGRADESCRIPTS += upgrade_3.0_to_4.0.sh
-UPGRADESCRIPTS += upgrade_4.0_to_5.0.sh
-UPGRADESCRIPTS += wipe_data.sh
+cqldir = ${datarootdir}/${PACKAGE_NAME}/scripts/cql
 
-sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/cql
-sqlscripts_DATA = dhcpdb_create.cql
-sqlscripts_DATA += dhcpdb_drop.cql
-sqlscripts_DATA += ${UPGRADESCRIPTS}
-sqlscripts_SCRIPTS = ${UPGRADESCRIPTS}
+# non-executable
+cql_DATA  =
+cql_DATA += dhcpdb_create.cql
+cql_DATA += dhcpdb_drop.cql
 
-DISTCLEANFILES = ${UPGRADESCRIPTS}
+# executable
+cql_SCRIPTS  =
+cql_SCRIPTS += upgrade_1.0_to_2.0.sh
+cql_SCRIPTS += upgrade_2.0_to_3.0.sh
+cql_SCRIPTS += upgrade_3.0_to_4.0.sh
+cql_SCRIPTS += upgrade_4.0_to_5.0.sh
+cql_SCRIPTS += wipe_data.sh
 
-EXTRA_DIST = ${sqlscripts_DATA}
+DISTCLEANFILES = ${cql_SCRIPTS}
+
+EXTRA_DIST = ${cql_DATA}
diff --git a/src/share/database/scripts/mysql/Makefile.am b/src/share/database/scripts/mysql/Makefile.am
index b44db9f41b..cb496e435a 100644
--- a/src/share/database/scripts/mysql/Makefile.am
+++ b/src/share/database/scripts/mysql/Makefile.am
@@ -1,32 +1,34 @@
 SUBDIRS = .
 
-UPGRADESCRIPTS =
-UPGRADESCRIPTS += upgrade_1.0_to_2.0.sh
-UPGRADESCRIPTS += upgrade_2.0_to_3.0.sh
-UPGRADESCRIPTS += upgrade_3.0_to_4.0.sh
-UPGRADESCRIPTS += upgrade_4.0_to_4.1.sh
-UPGRADESCRIPTS += upgrade_4.1_to_5.0.sh
-UPGRADESCRIPTS += upgrade_5.0_to_5.1.sh
-UPGRADESCRIPTS += upgrade_5.1_to_5.2.sh
-UPGRADESCRIPTS += upgrade_5.2_to_6.0.sh
-UPGRADESCRIPTS += upgrade_6.0_to_7.0.sh
-UPGRADESCRIPTS += upgrade_7.0_to_8.0.sh
-UPGRADESCRIPTS += upgrade_8.0_to_8.1.sh
-UPGRADESCRIPTS += upgrade_8.1_to_8.2.sh
-UPGRADESCRIPTS += upgrade_8.2_to_9.0.sh
-UPGRADESCRIPTS += upgrade_9.0_to_9.1.sh
-UPGRADESCRIPTS += upgrade_9.1_to_9.2.sh
-UPGRADESCRIPTS += upgrade_9.2_to_9.3.sh
-UPGRADESCRIPTS += upgrade_9.3_to_9.4.sh
-UPGRADESCRIPTS += upgrade_9.4_to_9.5.sh
-UPGRADESCRIPTS += wipe_data.sh
+mysqldir = ${datarootdir}/${PACKAGE_NAME}/scripts/mysql
 
-sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/mysql
-sqlscripts_DATA = dhcpdb_create.mysql
-sqlscripts_DATA += dhcpdb_drop.mysql
-sqlscripts_DATA += ${UPGRADESCRIPTS}
-sqlscripts_SCRIPTS = ${UPGRADESCRIPTS}
+# non-executable
+mysql_DATA  =
+mysql_DATA += dhcpdb_create.mysql
+mysql_DATA += dhcpdb_drop.mysql
 
-DISTCLEANFILES = ${UPGRADESCRIPTS}
+# executable
+mysql_SCRIPTS  =
+mysql_SCRIPTS += upgrade_1.0_to_2.0.sh
+mysql_SCRIPTS += upgrade_2.0_to_3.0.sh
+mysql_SCRIPTS += upgrade_3.0_to_4.0.sh
+mysql_SCRIPTS += upgrade_4.0_to_4.1.sh
+mysql_SCRIPTS += upgrade_4.1_to_5.0.sh
+mysql_SCRIPTS += upgrade_5.0_to_5.1.sh
+mysql_SCRIPTS += upgrade_5.1_to_5.2.sh
+mysql_SCRIPTS += upgrade_5.2_to_6.0.sh
+mysql_SCRIPTS += upgrade_6.0_to_7.0.sh
+mysql_SCRIPTS += upgrade_7.0_to_8.0.sh
+mysql_SCRIPTS += upgrade_8.0_to_8.1.sh
+mysql_SCRIPTS += upgrade_8.1_to_8.2.sh
+mysql_SCRIPTS += upgrade_8.2_to_9.0.sh
+mysql_SCRIPTS += upgrade_9.0_to_9.1.sh
+mysql_SCRIPTS += upgrade_9.1_to_9.2.sh
+mysql_SCRIPTS += upgrade_9.2_to_9.3.sh
+mysql_SCRIPTS += upgrade_9.3_to_9.4.sh
+mysql_SCRIPTS += upgrade_9.4_to_9.5.sh
+mysql_SCRIPTS += wipe_data.sh
 
-EXTRA_DIST = ${sqlscripts_DATA}
+DISTCLEANFILES = ${mysql_SCRIPTS}
+
+EXTRA_DIST = ${mysql_DATA}
diff --git a/src/share/database/scripts/pgsql/Makefile.am b/src/share/database/scripts/pgsql/Makefile.am
index 7f9fe5a823..41dbb7eec0 100644
--- a/src/share/database/scripts/pgsql/Makefile.am
+++ b/src/share/database/scripts/pgsql/Makefile.am
@@ -1,25 +1,27 @@
 SUBDIRS = .
 
-UPGRADESCRIPTS =
-UPGRADESCRIPTS += upgrade_1.0_to_2.0.sh
-UPGRADESCRIPTS += upgrade_2.0_to_3.0.sh
-UPGRADESCRIPTS += upgrade_3.0_to_3.1.sh
-UPGRADESCRIPTS += upgrade_3.1_to_3.2.sh
-UPGRADESCRIPTS += upgrade_3.2_to_3.3.sh
-UPGRADESCRIPTS += upgrade_3.3_to_4.0.sh
-UPGRADESCRIPTS += upgrade_4.0_to_5.0.sh
-UPGRADESCRIPTS += upgrade_5.0_to_5.1.sh
-UPGRADESCRIPTS += upgrade_5.1_to_6.0.sh
-UPGRADESCRIPTS += upgrade_6.0_to_6.1.sh
-UPGRADESCRIPTS += upgrade_6.1_to_6.2.sh
-UPGRADESCRIPTS += wipe_data.sh
+pgsqldir = ${datarootdir}/${PACKAGE_NAME}/scripts/pgsql
 
-sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/pgsql
-sqlscripts_DATA = dhcpdb_create.pgsql
-sqlscripts_DATA += dhcpdb_drop.pgsql
-sqlscripts_DATA += ${UPGRADESCRIPTS}
-sqlscripts_SCRIPTS = ${UPGRADESCRIPTS}
+# non-excutable
+pgsql_DATA  =
+pgsql_DATA += dhcpdb_create.pgsql
+pgsql_DATA += dhcpdb_drop.pgsql
 
-DISTCLEANFILES = ${UPGRADESCRIPTS}
+# executable
+pgsql_SCRIPTS  =
+pgsql_SCRIPTS += upgrade_1.0_to_2.0.sh
+pgsql_SCRIPTS += upgrade_2.0_to_3.0.sh
+pgsql_SCRIPTS += upgrade_3.0_to_3.1.sh
+pgsql_SCRIPTS += upgrade_3.1_to_3.2.sh
+pgsql_SCRIPTS += upgrade_3.2_to_3.3.sh
+pgsql_SCRIPTS += upgrade_3.3_to_4.0.sh
+pgsql_SCRIPTS += upgrade_4.0_to_5.0.sh
+pgsql_SCRIPTS += upgrade_5.0_to_5.1.sh
+pgsql_SCRIPTS += upgrade_5.1_to_6.0.sh
+pgsql_SCRIPTS += upgrade_6.0_to_6.1.sh
+pgsql_SCRIPTS += upgrade_6.1_to_6.2.sh
+pgsql_SCRIPTS += wipe_data.sh
 
-EXTRA_DIST = ${sqlscripts_DATA}
+DISTCLEANFILES = ${pgsql_SCRIPTS}
+
+EXTRA_DIST = ${pgsql_DATA}