diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 21:45:16 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 21:45:16 +0100 |
| commit | 048dfce072bb515f0e1e9bad30697246a1e107a9 (patch) | |
| tree | c158b10ebdd3c5772e60cfbcc0aa949373ccc103 /libmysql_r | |
| parent | 880b3d84d110a24ecb1fb7e053334f45d43b7210 (diff) | |
| parent | e9c502b3995c2e8dd0b5c3fb878e371a548989ba (diff) | |
| download | mariadb-git-048dfce072bb515f0e1e9bad30697246a1e107a9.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/mysql-5.0-merge
sql-common/my_time.c:
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 |