summaryrefslogtreecommitdiff
path: root/extra/Makefile.am
diff options
context:
space:
mode:
authormsvensson@shellback.(none) <>2006-09-19 08:17:34 +0200
committermsvensson@shellback.(none) <>2006-09-19 08:17:34 +0200
commite7fe105df8faa9a90d14140741dd673c9c159ec1 (patch)
tree29be27454d4c798e0aa4ef0670d4b8d046dfef7e /extra/Makefile.am
parentaf323655b7cb8fa3a2c2f8491b5b421b9fd1fa69 (diff)
parentefcb56cb79dbbf269d8175497b5e23aab5d5a93b (diff)
downloadmariadb-git-e7fe105df8faa9a90d14140741dd673c9c159ec1.tar.gz
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
Diffstat (limited to 'extra/Makefile.am')
-rw-r--r--extra/Makefile.am3
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 \