database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Makefile.am, make_binary_distribution.sh:

Browse Source 
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'
This commit is contained in:
unknown
2007-09-27 12:21:56 +02:00
parent 13bd3dbff2
commit 3e95b39882
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/Makefile.am
View File

@ -90,6 +90,9 @@ CLEANFILES = @server_scripts@ \
mysql_tableinfo \ mysql_tableinfo \
mysqld_multi 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 # mysqlbug should be distributed built so that people can report build
# failures with it. # failures with it.
DISTCLEANFILES = $(BUILT_SOURCES) mysqlbug DISTCLEANFILES = $(BUILT_SOURCES) mysqlbug
@ -134,6 +137,7 @@ SUFFIXES = .sh
-e 's!@''pkglibdir''@!$(pkglibdir)!g' \ -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
-e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \ -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
-e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \ -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
-e 's!@''pkgsuppdir''@!$(pkgsuppdir)!g' \
-e 's!@''sysconfdir''@!$(sysconfdir)!g' \ -e 's!@''sysconfdir''@!$(sysconfdir)!g' \
-e 's!@''mandir''@!$(mandir)!g' \ -e 's!@''mandir''@!$(mandir)!g' \
-e 's!@''infodir''@!$(infodir)!g' \ -e 's!@''infodir''@!$(infodir)!g' \

4
scripts/make_binary_distribution.sh
View File

@ -31,7 +31,7 @@
# "pkgincludedir" is set to the same as "includedir" # "pkgincludedir" is set to the same as "includedir"
# "pkgdatadir" is set to the same as "datadir" # "pkgdatadir" is set to the same as "datadir"
# "pkgsuppdir" is set to "@prefix@/support-files", # "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 # The temporary directory path given to "--tmp=<path>" has to be
# absolute and with no spaces. # absolute and with no spaces.
@ -175,6 +175,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
pkglibdir=@pkglibdir@ \ pkglibdir=@pkglibdir@ \
pkgincludedir=@pkgincludedir@ \ pkgincludedir=@pkgincludedir@ \
pkgdatadir=@pkgdatadir@ \ pkgdatadir=@pkgdatadir@ \
pkgsuppdir=@pkgsuppdir@ \
mandir=@mandir@ \ mandir=@mandir@ \
infodir=@infodir@ infodir=@infodir@
@ -215,6 +216,7 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
fi fi
# FIXME should be handled by make file, and to other dir # 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 scripts/mysqlaccess.conf $DEST/bin/
cp support-files/magic $DEST/support-files/ cp support-files/magic $DEST/support-files/

2
support-files/mysql.server.sh
View File

@ -385,7 +385,7 @@ case "$mode" in
fi fi
else else
# Try to find appropriate mysqld process # Try to find appropriate mysqld process
mysqld_pid=`pidof $sbindir/mysqld` mysqld_pid=`pidof $libexecdir/mysqld`
if test -z $mysqld_pid ; then if test -z $mysqld_pid ; then
if test "$use_mysqld_safe" = "0" ; then if test "$use_mysqld_safe" = "0" ; then
lockfile=/var/lock/subsys/mysqlmanager lockfile=/var/lock/subsys/mysqlmanager