diff options
| author | unknown <kent@mysql.com> | 2005-11-04 02:17:11 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-11-04 02:17:11 +0100 |
| commit | 233c6b797ff6c124ba52ae4562bf7e95f86ea301 (patch) | |
| tree | c262a4298ddcdc1e1f99fba719003fc9894a837b /libmysqld | |
| parent | 33bb96d9d2bbec5eac3944be4b1e631128733547 (diff) | |
| parent | b0701a5c3b3653082d69ee2429ba279adce2f53b (diff) | |
| download | mariadb-git-233c6b797ff6c124ba52ae4562bf7e95f86ea301.tar.gz | |
Merge
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 16 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 13 |
2 files changed, 15 insertions, 14 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 691bf0cd99f..8ddc8752f07 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -123,19 +123,19 @@ endif link_sources: set -x; \ for f in $(sqlsources); do \ - rm -f $(srcdir)/$$f; \ - @LN_CP_F@ $(srcdir)/../sql/$$f $(srcdir)/$$f; \ + rm -f $$f; \ + @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ done; \ for f in $(libmysqlsources); do \ - rm -f $(srcdir)/$$f; \ - @LN_CP_F@ $(srcdir)/../libmysql/$$f $(srcdir)/$$f; \ + rm -f $$f; \ + @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \ done; \ for f in $(sqlexamplessources); do \ - rm -f $(srcdir)/$$f; \ - @LN_CP_F@ $(srcdir)/../sql/examples/$$f $(srcdir)/$$f; \ + rm -f $$f; \ + @LN_CP_F@ $(top_srcdir)/sql/examples/$$f $$f; \ done; \ - rm -f $(srcdir)/client_settings.h; \ - @LN_CP_F@ $(srcdir)/../libmysql/client_settings.h $(srcdir)/client_settings.h; + rm -f client_settings.h; \ + @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h client_settings.h clean-local: diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 476f297fe0d..925a6573efe 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -21,14 +21,15 @@ tests_sources = $(mysql_client_test_embedded_SOURCES) CLEANFILES = $(client_sources) $(tests_sources) link_sources: + set -x; \ for f in $(client_sources); do \ - rm -f $(srcdir)/$$f; \ - @LN_CP_F@ $(srcdir)/../../client/$$f $(srcdir)/$$f; \ - done; + rm -f $$f; \ + @LN_CP_F@ $(top_srcdir)/client/$$f $$f; \ + done; \ for f in $(tests_sources); do \ - rm -f $(srcdir)/$$f; \ - @LN_CP_F@ $(srcdir)/../../tests/$$f $(srcdir)/$$f; \ - done; + rm -f $$f; \ + @LN_CP_F@ $(top_srcdir)/tests/$$f $$f; \ + done DEFS = -DEMBEDDED_LIBRARY INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \ |