diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-19 08:18:40 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-19 08:18:40 +0200 |
| commit | 21440cb4cb5a3f059a1e8e0fab17af390ad64fbd (patch) | |
| tree | e4efd4e1c5b6698cfd35d84dc5787fc4576f8206 /extra | |
| parent | fc78e7ffeea235db1557599383e8dc376a2dbe6e (diff) | |
| parent | 4b0af58230ddc2479063becd4ba276ccf0f751b0 (diff) | |
| download | mariadb-git-21440cb4cb5a3f059a1e8e0fab17af390ad64fbd.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into shellback.(none):/home/msvensson/mysql/mysql-5.0-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 fb6aa0ec89f..63d2b4055f7 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -32,8 +32,7 @@ DIST_SUBDIRS= yassl # 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 \ |