diff options
author | unknown <msvensson@shellback.(none)> | 2006-10-14 17:31:04 +0200 |
---|---|---|
committer | unknown <msvensson@shellback.(none)> | 2006-10-14 17:31:04 +0200 |
commit | 591d09a9609f26b44176cf6d33cbca1f8b41ac99 (patch) | |
tree | 8c09424b90940b27a31fdea0edf01adeb196987a /Makefile.am | |
parent | 98cc967d37bb52c82a6e78c63a9cb156b84be2b2 (diff) | |
parent | 380aa281dd3a620c80374d39374d2660171c1cea (diff) | |
download | mariadb-git-591d09a9609f26b44176cf6d33cbca1f8b41ac99.tar.gz |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
Makefile.am:
Auto merged
sql/sql_select.cc:
Auto merged
vio/viosocket.c:
Auto merged
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index d74615b624d..e45ae5222c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,8 +89,18 @@ bin-dist: all $(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@ # Remove BK's "SCCS" subdirectories from source distribution +# Create initial database files for Windows installations. dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` + if echo "$(distdir)" | grep -q '^/' ; then \ + scripts/mysql_install_db --no-defaults --windows \ + --basedir=$(top_srcdir) \ + --datadir="$(distdir)/win/data"; \ + else \ + scripts/mysql_install_db --no-defaults --windows \ + --basedir=$(top_srcdir) \ + --datadir="$$(pwd)/$(distdir)/win/data"; \ + fi tags: support-files/build-tags |