diff options
| author | unknown <serg@serg.mylan> | 2003-11-25 18:26:53 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-11-25 18:26:53 +0100 |
| commit | a1c0636d089a3f54c480be8326d73d2dad93b33c (patch) | |
| tree | d0d188167fd29e1446df7d81a039d931b931fa08 /Makefile.am | |
| parent | ab57ede75776c79eb5a6dca9dc6fd6760b7a3edf (diff) | |
| parent | ea280fd3ff1ab19370fba66e7f001351f8a23413 (diff) | |
| download | mariadb-git-a1c0636d089a3f54c480be8326d73d2dad93b33c.tar.gz | |
merged
Docs/Makefile.am:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysys/my_getopt.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/rpl_change_master.result:
merged - ul
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 56e5b78ea90..c330471169d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,9 +19,8 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory -EXTRA_DIST = INSTALL-SOURCE README \ - COPYING COPYING.LIB zlib -SUBDIRS = . include @docs_dirs@ \ +EXTRA_DIST = INSTALL-SOURCE README COPYING zlib +SUBDIRS = . include @docs_dirs@ \ @readline_topdir@ sql-common \ @thread_dirs@ pstack @sql_client_dirs@ \ @sql_server_dirs@ scripts man tests \ |