diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-20 09:36:16 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-20 09:36:16 +0200 |
| commit | 65baa8394fe50a76e9ab4d2db95dc3f17a42a2cb (patch) | |
| tree | 712f3b49ea572270889266053a41e72905c42119 /sql/Makefile.am | |
| parent | 54886b08cc95cff63a7077b2168a53fd9d52dc5c (diff) | |
| parent | 892e3a4107ecb7adf80b4df90feb9cc3fa3de5ba (diff) | |
| download | mariadb-git-65baa8394fe50a76e9ab4d2db95dc3f17a42a2cb.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
extra/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -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 a2f53c3c2da..c0924378670 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -27,7 +27,7 @@ INCLUDES = @ZLIB_INCLUDES@ \ WRAPLIBS= @WRAPLIBS@ SUBDIRS = share libexec_PROGRAMS = mysqld -noinst_PROGRAMS = gen_lex_hash +EXTRA_PROGRAMS = gen_lex_hash bin_PROGRAMS = mysql_tzinfo_to_sql gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ LDADD = $(top_builddir)/vio/libvio.a \ |