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 | |
| 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.
| -rw-r--r-- | libmysqld/Makefile.am | 6 | ||||
| -rw-r--r-- | netware/Makefile.am | 6 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 |
3 files changed, 7 insertions, 7 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; \ diff --git a/netware/Makefile.am b/netware/Makefile.am index 0d45d001d11..df0072b3a2b 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -98,20 +98,20 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \ # Build init_db.sql from the files that contain # the system tables for this version of MySQL plus any commands init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \ - $(top_srcdir)/scripts/mysql_system_tables_data.sql + $(top_srcdir)/scripts/mysql_system_tables_data.sql @echo "Building $@"; @echo "CREATE DATABASE mysql;" > $@; @echo "CREATE DATABASE test;" >> $@; @echo "use mysql;" >> $@; @cat $(top_srcdir)/scripts/mysql_system_tables.sql \ - $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@; + $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@; # Build test_db.sql from init_db.sql plus # some test data test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql @echo "Building $@"; @cat init_db.sql \ - $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; + $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; endif diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 9d344118f2b..3475e322e6e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -113,7 +113,7 @@ mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT) $(top_builddir)/scripts/comp_sql$(EXEEXT) \ - mysql_fix_privilege_tables \ + mysql_fix_privilege_tables \ $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ |