diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-02-12 18:28:35 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-02-12 18:28:35 +0200 |
| commit | 792fc9f7844575675206f873a0fa1d6e7fb8ad4f (patch) | |
| tree | 77d9d42655f4fa3afa8bb69d7aa15e174b617cad /sql/share | |
| parent | 6f78ef71d485fb3968355941860d012fc17a9c59 (diff) | |
| download | mariadb-git-792fc9f7844575675206f873a0fa1d6e7fb8ad4f.tar.gz | |
Bug #35250: readline check breaks when doing vpath build
Fixed several (obvious) places that don't work with vpath
build.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index 68b393e619f..357f9ac0876 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -22,7 +22,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 @@ -39,11 +39,11 @@ 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.txt \ + $(INSTALL_DATA) $(builddir)/errmsg.txt \ $(DESTDIR)$(pkgdatadir)/errmsg.txt; \ $(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README $(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets @@ -53,7 +53,7 @@ uninstall-local: @RM@ -f -r $(DESTDIR)$(pkgdatadir) distclean-local: - @RM@ -f */errmsg.sys + @RM@ -f $(builddir)/*/errmsg.sys # Do nothing link_sources: |