Commit 5d5c8c03 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kent/bk/mysql-5.0-build 

into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged
parents 3080e5a3 1a32976d

Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -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"; \