diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-01 12:39:44 +0300 |
| commit | 5867d275a39f4253e7401a034c50d3d169879853 (patch) | |
| tree | c9c3978afa21ee1f05cc50ff5b86a8ab31ec80ee /sql/share | |
| parent | 1db438506fad262d0a4a535c919a6ce8d78b28d3 (diff) | |
| parent | 84766b060a09ae3709fcd17cadc16c982c0d3a78 (diff) | |
| download | mariadb-git-5867d275a39f4253e7401a034c50d3d169879853.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/share/Makefile.am
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index da19ed1c5a7..cd4f7a83279 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -23,7 +23,7 @@ dist-hook: test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \ $(INSTALL_DATA) $(srcdir)/$$dir/*.* $(distdir)/$$dir; \ done; \ - sleep 1 ; touch $(srcdir)/*/errmsg.sys + sleep 1 ; touch $(builddir)/*/errmsg.sys $(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets $(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(distdir)/charsets @@ -40,12 +40,12 @@ install-data-local: for lang in @AVAILABLE_LANGUAGES@; \ do \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$lang; \ - $(INSTALL_DATA) $(srcdir)/$$lang/errmsg.sys \ + $(INSTALL_DATA) $(builddir)/$$lang/errmsg.sys \ $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.sys; \ done $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets - $(INSTALL_DATA) $(srcdir)/errmsg-utf8.txt \ - $(DESTDIR)$(pkgdatadir)/errmsg-utf8.txt; \ + $(INSTALL_DATA) $(builddir)/errmsg-utf8.txt \ + $(DESTDIR)$(pkgdatadir)/errmsg-utf8.txt; \ $(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README $(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets @@ -54,7 +54,7 @@ uninstall-local: @RM@ -f -r $(DESTDIR)$(pkgdatadir) distclean-local: - @RM@ -f */errmsg.sys + @RM@ -f $(builddir)/*/errmsg.sys # Do nothing link_sources: |