diff options
| author | unknown <holyfoot@mysql.com> | 2006-04-10 20:54:42 +0500 |
|---|---|---|
| committer | unknown <holyfoot@mysql.com> | 2006-04-10 20:54:42 +0500 |
| commit | 339bc7214ea23fc7472f2139263607fdfe40e0b8 (patch) | |
| tree | a923a57be60e300674b2de4fefce1e75ad398059 /client/Makefile.am | |
| parent | e0a19fd9043de0047d759e6978f0fc582452fab0 (diff) | |
| parent | de2201b13f543f927092b9c3ed8d30db084ca180 (diff) | |
| download | mariadb-git-339bc7214ea23fc7472f2139263607fdfe40e0b8.tar.gz | |
Merging
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 970ca744146..66f0ce9ad6d 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -39,7 +39,7 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \ bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ mysqldump mysqlimport mysqltest mysqlbinlog \ mysqltestmanagerc mysqltestmanager-pwgen \ - mysqlslap + mysqlslap mysql_upgrade noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ client_priv.h mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc @@ -72,11 +72,14 @@ mysqlslap_SOURCES= mysqlslap.c \ mysqldump_SOURCES= mysqldump.c my_user.c $(yassl_dummy_link_fix) mysqlimport_SOURCES= mysqlimport.c \ $(yassl_dummy_link_fix) +mysql_upgrade_SOURCES= mysql_upgrade.c $(yassl_dummy_link_fix) sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc strings_src=decimal.c # Fix for mit-threads -DEFS = -DUNDEF_THREADS_HACK +DEFS = -DUNDEF_THREADS_HACK \ + -DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \ + -DDATADIR="\"$(localstatedir)\"" EXTRA_DIST = get_password.c cmakelists.txt link_sources: |