diff options
| author | unknown <df@kahlann.erinye.com> | 2006-12-01 10:20:23 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-12-01 10:20:23 +0100 |
| commit | b6004e6295717c3b616b58416544557bd858afca (patch) | |
| tree | 12d8e6fe89a705c5dafc23e725f75d8cf73b9411 /Makefile.am | |
| parent | a49e1f4edf6ad144d066ba50ccc4c5c51a773215 (diff) | |
| parent | 922ea687fb4cfd9c3e8057905e7f7207a4fa3f3b (diff) | |
| download | mariadb-git-b6004e6295717c3b616b58416544557bd858afca.tar.gz | |
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
Makefile.am:
Auto merged
sql-common/my_time.c:
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 8a8858f9d7a..d1ca38b2f06 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"; \ |