Commit f798d068 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.1-maint


extra/Makefile.am:
  Auto merged
parents 9d04dee3 4b0af582

extra/Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ SUBDIRS = @yassl_dir@ 
# NOTE Built files should depend on their sources to avoid

# the built files being rebuilt in source dist

$(top_builddir)/include/mysqld_error.h: comp_err.c \

			$(top_srcdir)/sql/share/errmsg.txt \

			$(wildcard $(top_srcdir)/sql/share/charsets/*.xml)

			$(top_srcdir)/sql/share/errmsg.txt

	$(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)

	$(top_builddir)/extra/comp_err$(EXEEXT) \

	--charset=$(top_srcdir)/sql/share/charsets \