diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-11-29 19:42:19 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-11-29 19:42:19 +0100 |
| commit | 5d5c8c0312a8133222fe2b2d3f49a3d231a99ab7 (patch) | |
| tree | c1c34d6854ab8265b992ffa83825826a6e881716 /Makefile.am | |
| parent | 3080e5a3d791c6942d84e4bcbaf5643c8ccfc23e (diff) | |
| parent | 1a32976dea2da73fd119aeae600aa2c85706bd54 (diff) | |
| download | mariadb-git-5d5c8c0312a8133222fe2b2d3f49a3d231a99ab7.tar.gz | |
Merge mysql.com:/home/kent/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/mysql-5.1-build
Makefile.am:
Auto merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c2b0a71d9d1..8a6685bd143 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,12 +85,13 @@ bin-dist: all # Create initial database files for Windows installations. dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` - mkdir -p "$(distdir)/win" 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"; \ |