diff options
| author | unknown <serg@serg.mylan> | 2006-04-12 14:14:03 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-04-12 14:14:03 +0200 |
| commit | 1f0612d8696b061818ca14b6007dbf33300491fc (patch) | |
| tree | 50d64b7887c6220d23017d5fb7d58d9c45cbaf99 /Makefile.am | |
| parent | c6f311a0c1139af34c4b901def7c433d2e7b43ae (diff) | |
| parent | c566f9a25f53ea88ef75d2f4d6e8c6f61745b3e7 (diff) | |
| download | mariadb-git-1f0612d8696b061818ca14b6007dbf33300491fc.tar.gz | |
Auto merged
Makefile.am:
merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 4e648dabe27..8a668f3f59f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,25 +21,17 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT cmakelists.txt -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ +SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common \ @thread_dirs@ pstack \ - @sql_union_dirs@ @mysql_se_dirs@ \ + @sql_union_dirs@ storage \ @sql_server@ scripts @man_dirs@ tests \ @mysql_se_plugins@ \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ \ plugin win -DIST_SUBDIRS = . include @docs_dirs@ zlib \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ - strings mysys dbug extra regex storage \ - vio sql libmysql_r libmysql client scripts \ - @man_dirs@ tests SSL\ - BUILD netware @libmysqld_dirs@\ - @bench_dirs@ support-files server-tools tools \ - plugin win +DIST_SUBDIRS = $(SUBDIRS) SSL BUILD # Run these targets before any others, also make part of clean target, # to make sure we create new links after a clean. @@ -100,9 +92,11 @@ dist-hook: rm -rf `find $(distdir) -type d -name SCCS -print` if echo "$(distdir)" | grep -q '^/' ; then \ scripts/mysql_install_db --no-defaults --windows \ + --basedir=$(top_srcdir) \ --datadir="$(distdir)/win/data"; \ else \ scripts/mysql_install_db --no-defaults --windows \ + --basedir=$(top_srcdir) \ --datadir="$$(pwd)/$(distdir)/win/data"; \ fi |