diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-20 08:58:57 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-20 08:58:57 +0200 |
| commit | e0243f8c5509aa471966d5ae183acd7d7cf612a3 (patch) | |
| tree | bb2b0dc2798a6a13aabe94ff42620997158a9944 | |
| parent | fbf990ae0640eebc842cfeb50efb669cbd1c99be (diff) | |
| parent | a116258895d6df17aa6e955ae67286cd4ba999a7 (diff) | |
| download | mariadb-git-e0243f8c5509aa471966d5ae183acd7d7cf612a3.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
sql/Makefile.am:
Auto merged
| -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 58960040011..ddef6636559 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 \ |