diff options
| author | Razvan Becheriu <razvan@isc.org> | 2022-06-20 17:46:43 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2022-08-10 16:02:22 +0200 |
| commit | 2a5f4014ffc2a1f149b69436f754a3117712f350 (patch) | |
| tree | ec051ba04f95c782b4ff5d7e22809a0b2bdef818 /src/share | |
| parent | [#2071] fixed use of valgrind (diff) | |
| download | kea-2a5f4014ffc2a1f149b69436f754a3117712f350.tar.xz kea-2a5f4014ffc2a1f149b69436f754a3117712f350.zip | |
[#2071] fixed rebase
Diffstat (limited to 'src/share')
| -rw-r--r-- | src/share/database/scripts/mysql/upgrade_013_to_014.sh.in | 4 | ||||
| -rw-r--r-- | src/share/database/scripts/pgsql/upgrade_011_to_012.sh.in | 4 |
2 files changed, 4 insertions, 4 deletions
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 b442ef3bfe..82c3ff5138 100644 --- 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 00a02dcea2..e7ab2c316e 100644 --- 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 |