diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-19 08:22:42 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-19 08:22:42 +0200 |
| commit | f798d0680aec2c6742d0eb61cfa7a6b437dd52f1 (patch) | |
| tree | d6b672ff2e99ed4e0982f876ec96680049a44538 /extra | |
| parent | 9d04dee35f74236af2be5f5ee020a8e2105c86ef (diff) | |
| parent | 4b0af58230ddc2479063becd4ba276ccf0f751b0 (diff) | |
| download | mariadb-git-f798d0680aec2c6742d0eb61cfa7a6b437dd52f1.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
extra/Makefile.am:
Auto merged
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index c87be2c02aa..eed1f509631 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -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 \ |