summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authormsvensson@shellback.(none) <>2006-09-19 08:18:40 +0200
committermsvensson@shellback.(none) <>2006-09-19 08:18:40 +0200
commit49275c0caddae7c5c98dc67605790d028c766248 (patch)
treee4efd4e1c5b6698cfd35d84dc5787fc4576f8206 /extra
parentd94fa536821b66729ee505f2f58e2c9ba6eb36b8 (diff)
parentefcb56cb79dbbf269d8175497b5e23aab5d5a93b (diff)
downloadmariadb-git-49275c0caddae7c5c98dc67605790d028c766248.tar.gz
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'extra')
-rw-r--r--extra/Makefile.am3
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 \