diff options
| author | unknown <lenz@mysql.com> | 2004-07-30 14:03:16 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-07-30 14:03:16 +0200 |
| commit | 80de371ea304103f2555f7eddc77bcb42922c60d (patch) | |
| tree | f81185c38a417d48286ca658610fd899b9d7ed33 /sql | |
| parent | d130406c6d10031880754b590f876efff9e388a1 (diff) | |
| parent | d249218105081335be1c562acedcdff6e1f39a00 (diff) | |
| download | mariadb-git-80de371ea304103f2555f7eddc77bcb42922c60d.tar.gz | |
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 9859f1ef841..4eaf6d5377e 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -96,7 +96,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql.cc -mysql_tzinfo_to_sql_LDADD = $(LDADD) $(CXXLDFLAGS) +mysql_tzinfo_to_sql_LDADD = @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS) DEFS = -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ |