diff options
| author | unknown <monty@mysql.com> | 2004-05-27 02:51:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-27 02:51:28 +0300 |
| commit | d000ea9c4db6cfb3dd2314ae66e89cc193131ffd (patch) | |
| tree | 308534bfb5e99b83732f79c04f7f5fddc8fcf998 /Makefile.am | |
| parent | abd68407bf756cee304fda6d84b1e81716910fc3 (diff) | |
| parent | 1d03d1629d64801681238152800bec49c4472afd (diff) | |
| download | mariadb-git-d000ea9c4db6cfb3dd2314ae66e89cc193131ffd.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
netware/Makefile.am:
Auto merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 4e4c2da8082..aca5d4bade7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = . include @docs_dirs@ \ @readline_topdir@ sql-common \ @thread_dirs@ pstack @sql_client_dirs@ \ @sql_server_dirs@ scripts man tests SSL\ - BUILD @netware_dir@ os2 @libmysqld_dirs@ \ + BUILD netware os2 @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ # Relink after clean |