From 07469e3cbcaa8a0a89a1d3ea67eb79cd613f7dfc Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Nov 2006 19:35:40 +0100 Subject: Makefile.am: "make distcheck" fix, "win" directory Makefile.am: "make distcheck" fix, "win" directory --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 1a0afdf25f4..d52951ec876 100644 --- a/Makefile.am +++ b/Makefile.am @@ -92,6 +92,7 @@ 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 \ scripts/mysql_install_db --no-defaults --windows \ --basedir=$(top_srcdir) \ -- cgit v1.2.1 From 081caba69e958e23be247180772f4f13b287e3e0 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Nov 2006 19:41:48 +0100 Subject: Makefile.am: Corrected change to create "win" directory Makefile.am: Corrected change to create "win" directory --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index d52951ec876..a3c3c2c08a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -92,12 +92,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"; \ -- cgit v1.2.1 From dd1f084854e886979dc76c09837c6b2ea09c3aa0 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 29 Nov 2006 20:22:58 +0100 Subject: Makefile.am: Remove soft links before creating source TAR, to avoid file copies (bug#11865) Makefile.am: Remove soft links before creating source TAR, to avoid file copies (bug#11865) --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 12a867c1ad7..38e6a28b1b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,6 +91,7 @@ bin-dist: all # Remove BK's "SCCS" subdirectories from source distribution dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` + rm -f `find $(distdir) -type l -print` tags: support-files/build-tags -- cgit v1.2.1 From ca3e99d85c28310068fe4b176ad3b05cf78c9b9d Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 2 Dec 2006 23:16:47 +0100 Subject: mysql_install_db.sh: If --srcdir and --windows is given, check if error message file is in source or build tree (bug#24557) Makefile.am: Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557) mysql_install_db.sh: Added --srcdir=DIR option, used from top Makefile.am in dist-hook target, to find "fill_help_tables.sql" in VPATH build (bug#24557) Makefile.am: Work around problem with "distcleancheck", "sql_yacc.cc" might be in both the source and build tree. Call "mysql_install_db" with new option --srcdir, to enable the script to find all that is needed, if source and build directory is not the same (bug#24557) scripts/mysql_install_db.sh: If --srcdir and --windows is given, check if error message file is in source or build tree (bug#24557) Makefile.am: Work around problem with "distcleancheck", "sql_yacc.cc" might be in both the source and build tree. Call "mysql_install_db" with new option --srcdir, to enable the script to find all that is needed, if source and build directory is not the same (bug#24557) include/Makefile.am: Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557) --- Makefile.am | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 9752075fe78..6038825c928 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,6 +49,14 @@ BUILT_SOURCES = linked_client_sources linked_server_sources \ CLEANFILES = $(BUILT_SOURCES) bdb/build_unix/db.h DISTCLEANFILES = ac_available_languages_fragment +# Our current filtering of "sql_yacc.cc" in "sql/Makefile.am" creates +# a problem, if a VPATH build and "sql_yacc.cc" was part of the source +# distribution we end up with one "sql_yacc.cc" in the source tree, +# and one in the build tree. This breaks "distcleancheck", until this +# is sorted out we redefine the find that scans for files not removed + +distcleancheck_listfiles = find . -name sql_yacc.cc -o -type f -print + linked_include_sources: cd include; $(MAKE) link_sources echo timestamp > linked_include_sources @@ -93,17 +101,11 @@ bin-dist: all 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"; \ - fi + mkdir -p $(distdir)/win + scripts/mysql_install_db --no-defaults --windows \ + --basedir=$(top_builddir) \ + --datadir=$(distdir)/win/data \ + --srcdir=$(top_srcdir) tags: support-files/build-tags -- cgit v1.2.1