[#1469] fixed warnings

diff --git a/src/share/database/scripts/cql/Makefile.am b/src/share/database/scripts/cql/Makefile.am
index 97383666a3b17c3034bc62da3ba79bc27fe4ff3c..87c15a0ae9e6270c0c2407cd4e44897d4fa56e89 100644 (file)
--- a/src/share/database/scripts/cql/Makefile.am
+++ b/src/share/database/scripts/cql/Makefile.am
@@ -1,17 +1,17 @@
 SUBDIRS = .
 
-UPGRADE_SCRIPTS =
-UPGRADE_SCRIPTS += upgrade_1.0_to_2.0.sh
-UPGRADE_SCRIPTS += upgrade_2.0_to_3.0.sh
-UPGRADE_SCRIPTS += upgrade_3.0_to_4.0.sh
-UPGRADE_SCRIPTS += upgrade_4.0_to_5.0.sh
-UPGRADE_SCRIPTS += wipe_data.sh
+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
 
 sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/cql
 sqlscripts_DATA = dhcpdb_create.cql
 sqlscripts_DATA += dhcpdb_drop.cql
-sqlscripts_DATA += ${UPGRADE_SCRIPTS}
+sqlscripts_DATA += ${UPGRADESCRIPTS}
 
-DISTCLEANFILES = ${UPGRADE_SCRIPTS}
+DISTCLEANFILES = ${UPGRADESCRIPTS}
 
 EXTRA_DIST = ${sqlscripts_DATA}

diff --git a/src/share/database/scripts/mysql/Makefile.am b/src/share/database/scripts/mysql/Makefile.am
index 0083268956c6a61e8b4d4d749e78a08876ab20b6..ec9de9300e97dbbe8414c3ce3c44362c3dddf2d6 100644 (file)
--- a/src/share/database/scripts/mysql/Makefile.am
+++ b/src/share/database/scripts/mysql/Makefile.am
@@ -1,30 +1,30 @@
 SUBDIRS = .
 
-UPGRADE_SCRIPTS =
-UPGRADE_SCRIPTS += upgrade_1.0_to_2.0.sh
-UPGRADE_SCRIPTS += upgrade_2.0_to_3.0.sh
-UPGRADE_SCRIPTS += upgrade_3.0_to_4.0.sh
-UPGRADE_SCRIPTS += upgrade_4.0_to_4.1.sh
-UPGRADE_SCRIPTS += upgrade_4.1_to_5.0.sh
-UPGRADE_SCRIPTS += upgrade_5.0_to_5.1.sh
-UPGRADE_SCRIPTS += upgrade_5.1_to_5.2.sh
-UPGRADE_SCRIPTS += upgrade_5.2_to_6.0.sh
-UPGRADE_SCRIPTS += upgrade_6.0_to_7.0.sh
-UPGRADE_SCRIPTS += upgrade_7.0_to_8.0.sh
-UPGRADE_SCRIPTS += upgrade_8.0_to_8.1.sh
-UPGRADE_SCRIPTS += upgrade_8.1_to_8.2.sh
-UPGRADE_SCRIPTS += upgrade_8.2_to_9.0.sh
-UPGRADE_SCRIPTS += upgrade_9.0_to_9.1.sh
-UPGRADE_SCRIPTS += upgrade_9.1_to_9.2.sh
-UPGRADE_SCRIPTS += upgrade_9.2_to_9.3.sh
-UPGRADE_SCRIPTS += upgrade_9.3_to_9.4.sh
-UPGRADE_SCRIPTS += wipe_data.sh
+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 += wipe_data.sh
 
 sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/mysql
 sqlscripts_DATA = dhcpdb_create.mysql
 sqlscripts_DATA += dhcpdb_drop.mysql
-sqlscripts_DATA += ${UPGRADE_SCRIPTS}
+sqlscripts_DATA += ${UPGRADESCRIPTS}
 
-DISTCLEANFILES = ${UPGRADE_SCRIPTS}
+DISTCLEANFILES = ${UPGRADESCRIPTS}
 
 EXTRA_DIST = ${sqlscripts_DATA}

diff --git a/src/share/database/scripts/pgsql/Makefile.am b/src/share/database/scripts/pgsql/Makefile.am
index 7dae6ae1d70914796b7dcc59de60cd53b1bacda8..19a82c26801aee37d5c79b8bc75ca82bb4e03978 100644 (file)
--- a/src/share/database/scripts/pgsql/Makefile.am
+++ b/src/share/database/scripts/pgsql/Makefile.am
@@ -1,24 +1,24 @@
 SUBDIRS = .
 
-UPGRADE_SCRIPTS =
-UPGRADE_SCRIPTS += upgrade_1.0_to_2.0.sh
-UPGRADE_SCRIPTS += upgrade_2.0_to_3.0.sh
-UPGRADE_SCRIPTS += upgrade_3.0_to_3.1.sh
-UPGRADE_SCRIPTS += upgrade_3.1_to_3.2.sh
-UPGRADE_SCRIPTS += upgrade_3.2_to_3.3.sh
-UPGRADE_SCRIPTS += upgrade_3.3_to_4.0.sh
-UPGRADE_SCRIPTS += upgrade_4.0_to_5.0.sh
-UPGRADE_SCRIPTS += upgrade_5.0_to_5.1.sh
-UPGRADE_SCRIPTS += upgrade_5.1_to_6.0.sh
-UPGRADE_SCRIPTS += upgrade_6.0_to_6.1.sh
-UPGRADE_SCRIPTS += upgrade_6.1_to_6.2.sh
-UPGRADE_SCRIPTS += wipe_data.sh
+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
 
 sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/pgsql
 sqlscripts_DATA = dhcpdb_create.pgsql
 sqlscripts_DATA += dhcpdb_drop.pgsql
-sqlscripts_DATA += ${UPGRADE_SCRIPTS}
+sqlscripts_DATA += ${UPGRADESCRIPTS}
 
-DISTCLEANFILES = ${UPGRADE_SCRIPTS}
+DISTCLEANFILES = ${UPGRADESCRIPTS}
 
 EXTRA_DIST = ${sqlscripts_DATA}