summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknielsen@mysql.com <>2006-03-30 11:02:52 +0200
committerknielsen@mysql.com <>2006-03-30 11:02:52 +0200
commitce4463a13943e0b08e11b2eaf5c5a4362e5dfafa (patch)
treee085680734cbcceaac0944ca9c0014a8b702e12c
parent2b1f521286e6a8bf9bed3a40b42d9868db45b147 (diff)
downloadmariadb-git-ce4463a13943e0b08e11b2eaf5c5a4362e5dfafa.tar.gz
Add some stuff to source package needed for CMake Windows packaging.
-rw-r--r--Docs/Makefile.am7
-rw-r--r--Makefile.am8
2 files changed, 15 insertions, 0 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index f512aa9e29e..b3588263415 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -62,5 +62,12 @@ INSTALL-BINARY: mysql.info $(GT)
../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.%
diff --git a/Makefile.am b/Makefile.am
index 3d49ce03c12..3f17cbe797d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,8 +95,16 @@ 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 \
+ --datadir="$(distdir)/win/data"; \
+ else \
+ scripts/mysql_install_db --no-defaults --windows \
+ --datadir="$$(pwd)/$(distdir)/win/data"; \
+ fi
tags:
support-files/build-tags