diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-11-29 14:28:05 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-11-29 14:28:05 +0100 |
| commit | e93a20a5fc4a968e011fd6137baa2fbb790b5278 (patch) | |
| tree | 0ee6eeb1f7181479368c403d8a440911cfc29516 /libmysqld | |
| parent | b51cf266293929dec21e41bdc97c4eead4884f0e (diff) | |
| parent | 412d284e063471a17d4e445a9c80b9b0d1c40182 (diff) | |
| download | mariadb-git-e93a20a5fc4a968e011fd6137baa2fbb790b5278.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/mysql-5.1-build
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 0de37db63e2..7eb160776e0 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -29,8 +29,8 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ -DLIBDIR="\"$(MYSQLLIBdir)\"" INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \ + -I$(top_builddir)/sql -I$(top_srcdir)/sql \ + -I$(top_srcdir)/sql/examples \ -I$(top_srcdir)/regex \ $(openssl_includes) @ZLIB_INCLUDES@ \ @condition_dependent_plugin_includes@ @@ -155,16 +155,28 @@ endif #libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ #CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la -# This is called from the toplevel makefile +# This is called from the toplevel makefile. If we can link now +# to an existing file in source, we do that, else we assume it +# will show up in the build tree eventually (generated file). link_sources: set -x; \ for f in $(sqlsources); do \ rm -f $$f; \ - @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ + if test -e $(top_srcdir)/sql/$$f ; \ + then \ + @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ + else \ + @LN_CP_F@ $(top_builddir)/sql/$$f $$f; \ + fi ; \ done; \ for f in $(libmysqlsources); do \ rm -f $$f; \ - @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \ + if test -e $(top_srcdir)/libmysql/$$f ; \ + then \ + @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \ + else \ + @LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \ + fi ; \ done; \ if test -n "$(sqlstoragesources)" ; \ then \ |