diff options
author | unknown <guilhem@mysql.com> | 2004-11-15 23:52:04 +0100 |
---|---|---|
committer | unknown <guilhem@mysql.com> | 2004-11-15 23:52:04 +0100 |
commit | fa68d58087f0439fe9289ea3da830017a2ce5769 (patch) | |
tree | 34f207620bef0766a50ab94aa18cb120a3af0cb5 /Makefile.am | |
parent | ce85816690ce8a7cc52a4010463bf33a8d231a0f (diff) | |
parent | 5b20904078c215410c7655e39d66175a144ace8f (diff) | |
download | mariadb-git-fa68d58087f0439fe9289ea3da830017a2ce5769.tar.gz |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 0dbb5032e15..0770854f176 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,15 +22,15 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ + @thread_dirs@ pstack \ + @sql_server_dirs@ @sql_client_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_client_dirs@ \ - @sql_server_dirs@ scripts @man_dirs@ tests SSL\ + @thread_dirs@ pstack \ + @sql_server_dirs@ @sql_client_dirs@ scripts @man_dirs@ tests SSL\ BUILD netware os2 @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ |