[#2071] fixed paths for distcheck to work

41 files changed, 82 insertions, 82 deletions

diff --git a/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in b/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
index efbc2c8876..f9e3a1b0a1 100644
--- a/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_001.0_to_002.0.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/mysql/upgrade_002.0_to_003.0.sh.in b/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
index 78af24afb1..ad8b843071 100644
--- a/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_002.0_to_003.0.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/mysql/upgrade_003.0_to_004.0.sh.in b/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
index 3affd3af17..10cc7ff7d8 100644
--- a/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_003.0_to_004.0.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/mysql/upgrade_004.0_to_004.1.sh.in b/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
index 65a57ed0be..34b81cbcdd 100644
--- a/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_004.0_to_004.1.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/mysql/upgrade_004.1_to_005.0.sh.in b/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
index cfe3489b31..607fc03f3e 100644
--- a/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_004.1_to_005.0.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/mysql/upgrade_005.0_to_005.1.sh.in b/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
index 45f40b99e1..d129a72bb0 100644
--- a/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.0_to_005.1.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/mysql/upgrade_005.1_to_005.2.sh.in b/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
index 498787890b..415995c567 100644
--- a/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.1_to_005.2.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/mysql/upgrade_005.2_to_006.0.sh.in b/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
index 63392c868b..43a8e871a0 100644
--- a/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_005.2_to_006.0.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/mysql/upgrade_006.0_to_007.0.sh.in b/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
index 5d83da5866..4d1a2f7d37 100644
--- a/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_006.0_to_007.0.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/mysql/upgrade_007.0_to_008.0.sh.in b/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
index bba08bc7dc..6d6c52a425 100644
--- a/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_007.0_to_008.0.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/mysql/upgrade_008.0_to_008.1.sh.in b/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
index f2c3e4989e..e4e5fb3ae6 100644
--- a/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.0_to_008.1.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/mysql/upgrade_008.1_to_008.2.sh.in b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
index 4ad298e98e..d3243e31b8 100644
--- a/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.1_to_008.2.sh.in
@@ -22,8 +22,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/mysql/upgrade_008.2_to_009.0.sh.in b/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
index fdbf17dda4..c0d6ebf225 100644
--- a/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_008.2_to_009.0.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/mysql/upgrade_009.0_to_009.1.sh.in b/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
index 473a18f5e2..86a2203483 100644
--- a/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.0_to_009.1.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/mysql/upgrade_009.1_to_009.2.sh.in b/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
index 3b8cd34bf2..ef9d0c29d2 100644
--- a/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.1_to_009.2.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/mysql/upgrade_009.2_to_009.3.sh.in b/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
index 76e8608ac7..eb76089ce6 100644
--- a/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.2_to_009.3.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/mysql/upgrade_009.3_to_009.4.sh.in b/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
index 69b3f65e34..bd05fbe3af 100644
--- a/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.3_to_009.4.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/mysql/upgrade_009.4_to_009.5.sh.in b/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
index ebf3117f80..c02e10cf32 100644
--- a/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.4_to_009.5.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/mysql/upgrade_009.5_to_009.6.sh.in b/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
index 717730b40b..a99a46d61d 100644
--- a/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.5_to_009.6.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/mysql/upgrade_009.6_to_010.0.sh.in b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
index 1b01cad822..9e33e8b7f8 100644
--- a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.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/mysql/upgrade_010_to_011.sh.in b/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
index c5f512abb3..3d3e599925 100644
--- a/src/share/database/scripts/mysql/upgrade_010_to_011.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_010_to_011.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/mysql/upgrade_011_to_012.sh.in b/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
index c4142b2a17..5b73e9a1c1 100644
--- a/src/share/database/scripts/mysql/upgrade_011_to_012.sh.in
+++ b/src/share/database/scripts/mysql/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
diff --git a/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in b/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
index ee133d5928..09e0cfc8f6 100644
--- a/src/share/database/scripts/mysql/upgrade_012_to_013.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_012_to_013.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/mysql/wipe_data.sh.in b/src/share/database/scripts/mysql/wipe_data.sh.in
index 83a6f3f8c0..a31ca37745 100644
--- a/src/share/database/scripts/mysql/wipe_data.sh.in
+++ b/src/share/database/scripts/mysql/wipe_data.sh.in
@@ -25,8 +25,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_001.0_to_002.0.sh.in b/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in
index 658c92e632..1a7378a51c 100644
--- a/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_001.0_to_002.0.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_002.0_to_003.0.sh.in b/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
index bf793530bc..6683c39095 100644
--- a/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_002.0_to_003.0.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_003.0_to_003.1.sh.in b/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
index d5013cdd7a..48a8e1be51 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.0_to_003.1.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_003.1_to_003.2.sh.in b/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
index f9ec2bb9d8..79ba6501e9 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.1_to_003.2.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_003.2_to_003.3.sh.in b/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
index 6933c16f50..c39e593973 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.2_to_003.3.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_003.3_to_004.0.sh.in b/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
index d7a0885280..200e8937e6 100644
--- a/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_003.3_to_004.0.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_004.0_to_005.0.sh.in b/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
index 62c861d5f3..be62005d8b 100644
--- a/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_004.0_to_005.0.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_005.0_to_005.1.sh.in b/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
index bd3f5d1609..c99a417864 100644
--- a/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_005.0_to_005.1.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_005.1_to_006.0.sh.in b/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
index b1bf2d3793..f66520b3e7 100644
--- a/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_005.1_to_006.0.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_006.0_to_006.1.sh.in b/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
index b036c529f8..260196d360 100644
--- a/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.0_to_006.1.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_006.1_to_006.2.sh.in b/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
index 76bb8cd32c..38149a30cd 100644
--- a/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.1_to_006.2.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_006.2_to_007.0.sh.in b/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
index 0feeb0ae0d..a2065b2739 100644
--- a/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_006.2_to_007.0.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_007_to_008.sh.in b/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
index fe186522a6..f101dbdaa3 100644
--- a/src/share/database/scripts/pgsql/upgrade_007_to_008.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_007_to_008.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_008_to_009.sh.in b/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in
index b68ebf6bf7..64df2c3b99 100644
--- a/src/share/database/scripts/pgsql/upgrade_008_to_009.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_008_to_009.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_009_to_010.sh.in b/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in
index 4c66c427ad..cc8ff00f16 100644
--- a/src/share/database/scripts/pgsql/upgrade_009_to_010.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_009_to_010.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_010_to_011.sh.in b/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in
index 625265749c..7c35387a4d 100644
--- a/src/share/database/scripts/pgsql/upgrade_010_to_011.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_010_to_011.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/wipe_data.sh.in b/src/share/database/scripts/pgsql/wipe_data.sh.in
index 088b802e24..c19339cb09 100644
--- a/src/share/database/scripts/pgsql/wipe_data.sh.in
+++ b/src/share/database/scripts/pgsql/wipe_data.sh.in
@@ -25,8 +25,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