[backport of 4.1, because 4.0 autobuild now hits the same problem;

when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
parent bf17b75a
...@@ -30,6 +30,7 @@ dellis@goetia.(none) ...@@ -30,6 +30,7 @@ dellis@goetia.(none)
dlenev@brandersnatch.localdomain dlenev@brandersnatch.localdomain
dlenev@build.mysql.com dlenev@build.mysql.com
dlenev@mysql.com dlenev@mysql.com
gbichot@production.mysql.com
gbichot@quadxeon.mysql.com gbichot@quadxeon.mysql.com
gerberb@ou800.zenez.com gerberb@ou800.zenez.com
gluh@gluh.(none) gluh@gluh.(none)
......
...@@ -2720,7 +2720,6 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl ...@@ -2720,7 +2720,6 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl
test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
]) ])
rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
echo echo
echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the" echo "MySQL has a Web site at http://www.mysql.com/ which carries details on the"
echo "latest release, upcoming features, and other information to make your" echo "latest release, upcoming features, and other information to make your"
......
...@@ -25,7 +25,7 @@ dist-hook: ...@@ -25,7 +25,7 @@ dist-hook:
$(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets $(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets
$(INSTALL_DATA) $(srcdir)/charsets/Index $(distdir)/charsets $(INSTALL_DATA) $(srcdir)/charsets/Index $(distdir)/charsets
all: @AVAILABLE_LANGUAGES_ERRORS@ all-local: @AVAILABLE_LANGUAGES_ERRORS@
# this is ugly, but portable # this is ugly, but portable
@AVAILABLE_LANGUAGES_ERRORS_RULES@ @AVAILABLE_LANGUAGES_ERRORS_RULES@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment