Merge
This commit is contained in:
commit
0d332aef39
@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
bin_SCRIPTS = ndb_error_reporter
|
bin_SCRIPTS = ndb_size.pl ndb_error_reporter
|
||||||
|
dist_pkgdata_DATA = ndb_size.tmpl
|
||||||
|
|
||||||
ndbtools_PROGRAMS = \
|
ndbtools_PROGRAMS = \
|
||||||
ndb_test_platform \
|
ndb_test_platform \
|
||||||
|
@ -82,10 +82,15 @@ basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
|
|||||||
ldata='@localstatedir@'
|
ldata='@localstatedir@'
|
||||||
execdir='@libexecdir@'
|
execdir='@libexecdir@'
|
||||||
bindir='@bindir@'
|
bindir='@bindir@'
|
||||||
|
|
||||||
|
# If installed, search for the compiled in directory first (might be "lib64")
|
||||||
pkglibdir='@pkglibdir@'
|
pkglibdir='@pkglibdir@'
|
||||||
fix_path pkglibdir lib/mysql lib
|
pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
|
||||||
|
fix_path pkglibdir $pkglibdir_rel lib/mysql lib
|
||||||
|
|
||||||
pkgincludedir='@pkgincludedir@'
|
pkgincludedir='@pkgincludedir@'
|
||||||
fix_path pkgincludedir include/mysql include
|
fix_path pkgincludedir include/mysql include
|
||||||
|
|
||||||
version='@VERSION@'
|
version='@VERSION@'
|
||||||
socket='@MYSQL_UNIX_ADDR@'
|
socket='@MYSQL_UNIX_ADDR@'
|
||||||
port='@MYSQL_TCP_PORT@'
|
port='@MYSQL_TCP_PORT@'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user