diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-19 08:17:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-19 08:17:34 +0200 |
| commit | fbf990ae0640eebc842cfeb50efb669cbd1c99be (patch) | |
| tree | 29be27454d4c798e0aa4ef0670d4b8d046dfef7e /extra/Makefile.am | |
| parent | fb63fdb9eec07e815bda7d94a4d9632ede9380db (diff) | |
| parent | 4b0af58230ddc2479063becd4ba276ccf0f751b0 (diff) | |
| download | mariadb-git-fbf990ae0640eebc842cfeb50efb669cbd1c99be.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
extra/Makefile.am:
Auto merged
Diffstat (limited to 'extra/Makefile.am')
| -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 \ |