From 3e95b39882ba06e0d165027b9b08c210241bc531 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com/kent-amd64.(none)>
Date: Thu, 27 Sep 2007 12:21:56 +0200
Subject: [PATCH] Makefile.am, make_binary_distribution.sh:   Use custom
 'pkgduppdir' mysql.server.sh:   The server is installed in 'libexecdir'

scripts/Makefile.am:
  Use custom 'pkgduppdir'
scripts/make_binary_distribution.sh:
  Use custom 'pkgduppdir'
support-files/mysql.server.sh:
  The server is installed in 'libexecdir'
---
 scripts/Makefile.am                 | 4 ++++
 scripts/make_binary_distribution.sh | 4 +++-
 support-files/mysql.server.sh       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 471a23f0a73..fed96490397 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -90,6 +90,9 @@ CLEANFILES =		@server_scripts@ \
 			mysql_tableinfo \
 			mysqld_multi
 
+# Default same as 'pkgdatadir', but we can override it
+pkgsuppdir =		$(datadir)/@PACKAGE@
+
 # mysqlbug should be distributed built so that people can report build
 # failures with it.
 DISTCLEANFILES =        $(BUILT_SOURCES) mysqlbug
@@ -134,6 +137,7 @@ SUFFIXES = .sh
 	  -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
 	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
 	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
+	  -e 's!@''pkgsuppdir''@!$(pkgsuppdir)!g' \
 	  -e 's!@''sysconfdir''@!$(sysconfdir)!g' \
 	  -e 's!@''mandir''@!$(mandir)!g' \
 	  -e 's!@''infodir''@!$(infodir)!g' \
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 73d47b1b320..4d027659227 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -31,7 +31,7 @@
 #    "pkgincludedir" is set to the same as "includedir"
 #    "pkgdatadir"    is set to the same as "datadir"
 #    "pkgsuppdir"    is set to "@prefix@/support-files",
-#                    normally the same as "datadir" (not to set?)
+#                    normally the same as "datadir"
 #
 #  The temporary directory path given to "--tmp=<path>" has to be
 #  absolute and with no spaces.
@@ -175,6 +175,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
     pkglibdir=@pkglibdir@ \
     pkgincludedir=@pkgincludedir@ \
     pkgdatadir=@pkgdatadir@ \
+    pkgsuppdir=@pkgsuppdir@ \
     mandir=@mandir@ \
     infodir=@infodir@
 
@@ -215,6 +216,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
   fi
 
   # FIXME should be handled by make file, and to other dir
+  mkdir -p $DEST/bin $DEST/support-files
   cp scripts/mysqlaccess.conf $DEST/bin/
   cp support-files/magic      $DEST/support-files/
 
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 92d9731e72d..e0933aff8a4 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -385,7 +385,7 @@ case "$mode" in
       fi
     else
       # Try to find appropriate mysqld process
-      mysqld_pid=`pidof $sbindir/mysqld`
+      mysqld_pid=`pidof $libexecdir/mysqld`
       if test -z $mysqld_pid ; then 
         if test "$use_mysqld_safe" = "0" ; then 
           lockfile=/var/lock/subsys/mysqlmanager