summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2005-04-04 03:49:10 +0400
committerunknown <petr@mysql.com>2005-04-04 03:49:10 +0400
commitd67f4397dc62bc7270f0e4bdaa2095f9a0959548 (patch)
tree7ee4a6ad37f2a883eaae5ba52e4bade76c87adf6 /tools
parentba8dc8e9f216e06533973bc2810751f0be42221d (diff)
downloadmariadb-git-d67f4397dc62bc7270f0e4bdaa2095f9a0959548.tar.gz
Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box) client/Makefile.am: old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into mysqltestmanager, mysqltestmanagerc and mysqltestmanager-pwgen respectively mysql-test/mysql-test-run.sh: Old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into mysqltestmanager, mysqltestmanagerc and mysqltestmanager-pwgen respectively scripts/make_binary_distribution.sh: Fix the script to include IM and process mysql.server correctly server-tools/instance-manager/Makefile.am: change default socket name to follow mysqld style (and thus, fix the ptoblem with non-existant localstatedir in the binary distribution) support-files/mysql.spec.sh: Fix mysql.spec template to reflect the name change tools/Makefile.am: old mysqlmanager renamed into mysqltestmanager
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8b8ada600f5..3b84aafeaa9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,9 +19,9 @@ INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \
-I$(top_builddir)/include
LDADD= @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \
$(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@
-bin_PROGRAMS= mysqlmanager
-mysqlmanager_SOURCES= mysqlmanager.c
-mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
+bin_PROGRAMS= mysqltestmanager
+mysqltestmanager_SOURCES= mysqlmanager.c
+mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
DEF= -DUNDEF_THREADS_HACK
# Don't update the files from bitkeeper