Commit 33985e75 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738 

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/Makefile.am:
  Auto merged
parents 4cb97ad7 a1162588

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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 \