diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-01 10:17:27 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-01 10:17:27 +0100 |
| commit | 922ea687fb4cfd9c3e8057905e7f7207a4fa3f3b (patch) | |
| tree | 96b6313a7d31f505b9058997367f4b7a7206b705 /Makefile.am | |
| parent | f8d8b3db916d71697a6d5f00eba4f0da6f522959 (diff) | |
| parent | 1c8facbc9fbad7e6af87d9b200457366269cf297 (diff) | |
| download | mariadb-git-922ea687fb4cfd9c3e8057905e7f7207a4fa3f3b.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
mysql-test/lib/mtr_process.pl:
Auto merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index c0798fbb5c7..ca154ca55d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,11 +85,14 @@ bin-dist: all # Create initial database files for Windows installations. dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` + rm -f `find $(distdir) -type l -print` if echo "$(distdir)" | grep -q '^/' ; then \ + mkdir -p "$(distdir)/win" ; \ scripts/mysql_install_db --no-defaults --windows \ --basedir=$(top_srcdir) \ --datadir="$(distdir)/win/data"; \ else \ + mkdir -p "$$(pwd)/$(distdir)/win" ; \ scripts/mysql_install_db --no-defaults --windows \ --basedir=$(top_srcdir) \ --datadir="$$(pwd)/$(distdir)/win/data"; \ |