diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-12-10 12:16:41 +0100 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-12-10 12:16:41 +0100 |
| commit | 38fe0fe331e69aae5520a8b43bd8b45e5e237147 (patch) | |
| tree | 076fd59c0509c986b983131b1f5a4b757a5c2b16 /Makefile.am | |
| parent | 9e5c7f6f739eb20adae775d1ff94e2bbc02a42ee (diff) | |
| parent | 9e5ed26076c1999f4437eca4a7ef133962f2e30f (diff) | |
| download | mariadb-git-38fe0fe331e69aae5520a8b43bd8b45e5e237147.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
Makefile.am:
Auto merged
configure.in:
null merge version change
scripts/mysql_install_db.sh:
manual merge
scripts/mysql_system_tables_data.sql:
manual merge
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index bc28fa3082b..b3f069f0e78 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,7 @@ bin-dist: all dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` mkdir -p $(distdir)/win - scripts/mysql_install_db --no-defaults --windows \ + scripts/mysql_install_db --no-defaults --cross-bootstrap \ --builddir=$(top_builddir) \ --datadir=$(distdir)/win/data \ --srcdir=$(top_srcdir) |