diff options
| author | unknown <joerg@trift2.> | 2007-05-02 14:08:43 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-05-02 14:08:43 +0200 |
| commit | 67601f55cbeea93d37b3c73ea5868a496e08cedc (patch) | |
| tree | 6686a05d664f8f110df9e9393c266b51f48f84dc /libmysqld | |
| parent | 55153730b2aadba899284b2862647edefaa44757 (diff) | |
| parent | 589ae7b4e090aa866b492a823f7e773bda03e1ec (diff) | |
| download | mariadb-git-67601f55cbeea93d37b3c73ea5868a496e08cedc.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M51/mysql-5.1
libmysqld/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
Auto merged
client/Makefile.am:
Merge does not fit - to be done manually.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index a9e951cb9af..cf5971affe4 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -190,11 +190,11 @@ link_sources: for f in $(sqlsources); do \ rm -f $$f; \ if test -e $(top_srcdir)/sql/$$f ; \ - then \ + then \ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ - else \ + else \ @LN_CP_F@ $(top_builddir)/sql/$$f $$f; \ - fi ; \ + fi ; \ done; \ for f in $(libmysqlsources); do \ rm -f $$f; \ |