diff options
author | anjuta@arthur.local <> | 2004-12-13 22:51:54 +0200 |
---|---|---|
committer | anjuta@arthur.local <> | 2004-12-13 22:51:54 +0200 |
commit | f9451974be262d8be6d07dfc76f650af4c245ca2 (patch) | |
tree | ada783a806498c8c73335dba30a6ef0100e0ad74 /sql/share/Makefile.am | |
parent | ba77277952cd6ddbc22572b1bca6851c04d4d562 (diff) | |
download | mariadb-git-f9451974be262d8be6d07dfc76f650af4c245ca2.tar.gz |
WL#1051, more maintanable error messages.
Diffstat (limited to 'sql/share/Makefile.am')
-rw-r--r-- | sql/share/Makefile.am | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index 662159a9c63..b50ba2be8da 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -9,10 +9,13 @@ dist-hook: $(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets $(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(distdir)/charsets -all: @AVAILABLE_LANGUAGES_ERRORS@ +all: english/errmsg.sys -# this is ugly, but portable -@AVAILABLE_LANGUAGES_ERRORS_RULES@ +# Use the english errmsg.sys as a flag that all errmsg.sys needs to be +# created. Normally these are created by extra/Makefile.am + +english/errmsg.sys: errmsg.txt + $(top_builddir)/extra/comp_err --charset=$(srcdir)/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=errmsg.txt install-data-local: for lang in @AVAILABLE_LANGUAGES@; \ @@ -20,18 +23,12 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$lang; \ $(INSTALL_DATA) $(srcdir)/$$lang/errmsg.sys \ $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.sys; \ - $(INSTALL_DATA) $(srcdir)/$$lang/errmsg.txt \ - $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.txt; \ done $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets + $(INSTALL_DATA) $(srcdir)/errmsg.txt \ + $(DESTDIR)$(pkgdatadir)/errmsg.txt; \ $(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README $(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets -fix_errors: - for lang in @AVAILABLE_LANGUAGES@; \ - do \ - ../../extra/comp_err -C$(srcdir)/charsets/ $(srcdir)/$$lang/errmsg.txt $(srcdir)/$$lang/errmsg.sys; \ - done - # Don't update the files from bitkeeper %::SCCS/s.% |