diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 15:21:28 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 15:21:28 +0100 |
| commit | 90578ce767ed8419c0014aa3175e3f6e58a60128 (patch) | |
| tree | e5a5f3cfe1fd04961923f4d1b6742a81eb6ef226 /libmysql_r | |
| parent | 004aadd6f716e2bdd055a2518b50bd8d13e961e8 (diff) | |
| parent | 867fc51c5d9227f8f2892d11b98becfa508baba7 (diff) | |
| download | mariadb-git-90578ce767ed8419c0014aa3175e3f6e58a60128.tar.gz | |
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
mysql-test/t/view_grant.test:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'libmysql_r')
| -rw-r--r-- | libmysql_r/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index aaf81add00b..062acccda07 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -29,8 +29,6 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include include $(top_srcdir)/libmysql/Makefile.shared -libmysql_dir = $(top_srcdir)/libmysql - libmysqlclient_r_la_SOURCES = $(target_sources) libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las) libmysqlclient_r_la_LDFLAGS = $(target_ldflags) @@ -38,7 +36,9 @@ libmysqlclient_r_la_LDFLAGS = $(target_ldflags) # This is called from the toplevel makefile link_sources: set -x; \ - for f in `cd $(libmysql_dir) && echo *.[ch]`; do \ - rm -f $$f; \ - @LN_CP_F@ $(libmysql_dir)/$$f $$f; \ + for d in $(top_srcdir)/libmysql $(top_builddir)/libmysql; do \ + for f in `cd $$d && echo *.[ch]`; do \ + rm -f $$f; \ + @LN_CP_F@ $$d/$$f $$f; \ + done; \ done |