summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <gbichot@quadita2.mysql.com>2005-04-11 17:37:49 +0200
committerunknown <gbichot@quadita2.mysql.com>2005-04-11 17:37:49 +0200
commit08b89a2b7409f6638e96a8cffe9e8df9596b2527 (patch)
tree1e65d48b65f74e2050c91d300ecca170f640d7e7
parent6bf0fcd1365be34ad697b0998edb2bf9c7a47c66 (diff)
downloadmariadb-git-08b89a2b7409f6638e96a8cffe9e8df9596b2527.tar.gz
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) (thx Serg). In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin). sql/share/Makefile.am: using "all:" leads to double-"all:" in Makefile (counting the auto-generated); all-local is the standard way to add something to all: (thanks Konstantin) configure.in: Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in 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 :( )
-rw-r--r--configure.in1
-rw-r--r--sql/share/Makefile.am2
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index c4bd95b9a24..3ca60a9faed 100644
--- a/configure.in
+++ b/configure.in
@@ -3238,7 +3238,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
AC_OUTPUT
-rm -f $AVAILABLE_LANGUAGES_ERRORS_RULES
echo
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"
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am
index 662159a9c63..9f636e02535 100644
--- a/sql/share/Makefile.am
+++ b/sql/share/Makefile.am
@@ -9,7 +9,7 @@ dist-hook:
$(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets
$(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(distdir)/charsets
-all: @AVAILABLE_LANGUAGES_ERRORS@
+all-local: @AVAILABLE_LANGUAGES_ERRORS@
# this is ugly, but portable
@AVAILABLE_LANGUAGES_ERRORS_RULES@