diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-20 08:57:51 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-20 08:57:51 +0200 |
| commit | 33985e7562e894560766559ec818cef4506d60d1 (patch) | |
| tree | f0777720659c2ebf97b7053ffcb60067f8b80fa5 /sql/Makefile.am | |
| parent | 4cb97ad79b2b1024ca703afdde35d7eedc3d83ac (diff) | |
| parent | a116258895d6df17aa6e955ae67286cd4ba999a7 (diff) | |
| download | mariadb-git-33985e7562e894560766559ec818cef4506d60d1.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
sql/Makefile.am:
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 a317715922d..45f87621e07 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)/myisam/libmyisam.a \ |