Commit 4e927376 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 

into  neptunus.(none):/home/msvensson/mysql/work/my50-work


sql/Makefile.am:
  Auto merged
parents 0c72b05a 6f3c9bfa

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 \