diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-12-02 23:22:53 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-12-02 23:22:53 +0100 |
| commit | 531f2eeddfdef71b265a399f521e7cce3e8ce9d7 (patch) | |
| tree | 70c4448334ba144f499e655f1ecb9eb7f736cfa5 /Makefile.am | |
| parent | 68a5b1d22520380755f73e85c8bf60eab7bc0d37 (diff) | |
| parent | 1172c8ae5568374de74037644a9a082722df9fab (diff) | |
| download | mariadb-git-531f2eeddfdef71b265a399f521e7cce3e8ce9d7.tar.gz | |
Merge mysql.com:/home/kent/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/mysql-5.1-build
Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index d1ca38b2f06..81656d67f74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,14 @@ BUILT_SOURCES = linked_client_sources linked_server_sources \ CLEANFILES = $(BUILT_SOURCES) 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 @@ -86,17 +94,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 |