diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 18:47:07 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 18:47:07 +0100 |
| commit | 6bf44c38972bfe350fcce183c6bdee85d12912a8 (patch) | |
| tree | ba91e19692394bc120e136e14093142cfc58bac9 /libmysql_r | |
| parent | 0d7ea9197231180dfa953eddfc59f0a03f3d85bb (diff) | |
| parent | ba1dde1a49689ff077abb1966ec637433c130d1d (diff) | |
| download | mariadb-git-6bf44c38972bfe350fcce183c6bdee85d12912a8.tar.gz | |
Merge mysql.com:/home/kent/bk/mysql-4.1
into mysql.com:/home/kent/bk/mysql-5.0
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
bdb/dist/gen_rec.awk:
Auto merged
libmysql_r/Makefile.am:
Auto merged
ndb/config/type_ndbapitools.mk.am:
Auto merged
ndb/src/kernel/Makefile.am:
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 |