diff options
| author | unknown <joerg@mysql.com> | 2004-12-30 14:03:19 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2004-12-30 14:03:19 +0100 |
| commit | f116ac5cdd84cf7e85aa9803e31e9d506c906f95 (patch) | |
| tree | ffb1778d170b1aaab1eec0035964526f51982c69 /Makefile.am | |
| parent | 05fb4757f984607737999b86dc052b5c91bf5bd8 (diff) | |
| download | mariadb-git-f116ac5cdd84cf7e85aa9803e31e9d506c906f95.tar.gz | |
Clean up the handling of "server" and "client" directories, while still avoiding the double listing of
common directories in 'SUBDIRS' macro ("make distclean" had failed due to that).
Solves bug#7368: "regex make error in 4.1.8"
BitKeeper/etc/ignore:
Added ndb/include/ndb_version.h ndb/include/ndb_global.h to the ignore list
Makefile.am:
Build the 'SUBDIRS' list from the new variable 'sql_union_dirs', not the old "client" and "servers" lists which will overlap.
That overlap worked for build runs, but it caused failures of 'make distclean' etc because the overlapping directories
were cleaned twice which could not work.
Solves bug#7368: "regex make error in 4.1.8"
configure.in:
Introduce a new variable 'sql_union_dirs' to contain those directories which are needed for either server or client.
This is needed to have complete "server" and "client" directory lists in 'Makefile' but prevent double listing
in 'SUBDIRS' (see the comment for 'Makefile.am').
Solves bug#7368: "regex make error in 4.1.8"
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index c1ae9217e8b..93f34986a1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,14 +23,14 @@ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common \ @thread_dirs@ pstack \ - @sql_server_dirs@ @sql_client_dirs@ scripts man tests \ + @sql_union_dirs@ scripts man tests \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ @thread_dirs@ pstack \ - @sql_server_dirs@ @sql_client_dirs@ scripts @man_dirs@ tests SSL\ + @sql_union_dirs@ scripts @man_dirs@ tests SSL\ BUILD netware os2 @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ |