diff options
| author | unknown <lenz@mysql.com> | 2005-06-07 11:40:56 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-06-07 11:40:56 +0200 |
| commit | 7037b7bd1c98e57f598eebf723cae3b8dddd2b06 (patch) | |
| tree | db9249f12897939a3986b0d605d0afb9aece8f9b /scripts | |
| parent | 7a6c62a107b961d2713cbd3ec56e11652920f45b (diff) | |
| parent | af72f54b530247582f7f8e907a74d2d0d7ccadb8 (diff) | |
| download | mariadb-git-7037b7bd1c98e57f598eebf723cae3b8dddd2b06.tar.gz | |
- manual merge of mysql.spec.sh
scripts/Makefile.am:
Auto merged
support-files/mysql.spec.sh:
- post merge fixes
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b2fef9acadf..225e8bdccbb 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -33,8 +33,6 @@ bin_SCRIPTS = @server_scripts@ \ mysql_explain_log \ mysql_tableinfo \ mysqld_multi \ - make_win_src_distribution \ - make_win_binary_distribution \ mysql_create_system_tables EXTRA_SCRIPTS = make_binary_distribution.sh \ @@ -86,6 +84,7 @@ CLEANFILES = @server_scripts@ \ mysqldumpslow \ mysqld_multi \ make_win_src_distribution \ + make_win_binary_distribution \ mysql_create_system_tables DISTCLEANFILES = mysqlbug |