summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorjoerg@mysql.com <>2004-12-30 14:03:19 +0100
committerjoerg@mysql.com <>2004-12-30 14:03:19 +0100
commit8311f83f06836ff1bdee986090f26876dfd745ef (patch)
treeffb1778d170b1aaab1eec0035964526f51982c69 /Makefile.am
parent2f9c038ecfd09c37a2ce45a2307c2c627df5799a (diff)
downloadmariadb-git-8311f83f06836ff1bdee986090f26876dfd745ef.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"
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
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@