bk commit into 5.1 tree (knielsen:1.2264)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2264 06/03/30 11:02:52 knielsen@stripped +2 -0
  Add some stuff to source package needed for CMake Windows packaging.

  Makefile.am
    1.84 06/03/30 11:02:48 knielsen@stripped +8 -0
    Include initial Windows database files in source package, needed for
    CMake packaging

  Docs/Makefile.am
    1.58 06/03/30 11:02:48 knielsen@stripped +7 -0
    Include Windows manual in source package (if available), needed for CMake
    packaging.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-win-src

--- 1.57/Docs/Makefile.am	2006-01-06 17:32:12 +01:00
+++ 1.58/Docs/Makefile.am	2006-03-30 11:02:48 +02:00
@@ -62,5 +62,12 @@
 ../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)
 	perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@
 
+# Include the Windows manual.chm in source .tar.gz only if available.
+# It is not in BitKeeper, but is downloaded from intranet by Bootstrap.
+dist-hook:
+	if [ -e $(srcdir)/manual.chm ] ; then \
+	  cp $(srcdir)/manual.chm $(distdir); \
+	fi
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%

--- 1.83/Makefile.am	2006-03-24 22:50:42 +01:00
+++ 1.84/Makefile.am	2006-03-30 11:02:48 +02:00
@@ -95,8 +95,16 @@
 	$(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 \
+		--datadir="$(distdir)/win/data"; \
+	else \
+	  scripts/mysql_install_db --no-defaults --windows \
+		 --datadir="$$(pwd)/$(distdir)/win/data"; \
+	fi
 
 tags:
 	support-files/build-tags