diff options
| author | unknown <lenz@mysql.com> | 2005-07-25 15:04:28 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-07-25 15:04:28 +0200 |
| commit | c15cab9636f4f2dec2a822a83fb86e3ea84f2d0f (patch) | |
| tree | 355c539486c44f234050c46cd6f9c80c059d9849 /scripts/Makefile.am | |
| parent | 0eea2a124bd5c8269a5382da9ac82526a5e2f384 (diff) | |
| parent | fe862aa987b33cc44a31fc6f5051d5ba41ffd0c8 (diff) | |
| download | mariadb-git-c15cab9636f4f2dec2a822a83fb86e3ea84f2d0f.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0-build
scripts/Makefile.am:
Auto merged
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 225e8bdccbb..474ebedda62 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -35,10 +35,13 @@ bin_SCRIPTS = @server_scripts@ \ mysqld_multi \ mysql_create_system_tables +noinst_SCRIPTS = make_binary_distribution \ + make_sharedlib_distribution \ + make_win_src_distribution + EXTRA_SCRIPTS = make_binary_distribution.sh \ make_sharedlib_distribution.sh \ make_win_src_distribution.sh \ - make_win_binary_distribution.sh \ msql2mysql.sh \ mysql_config.sh \ mysql_fix_privilege_tables.sh \ @@ -147,5 +150,3 @@ SUFFIXES = .sh # Don't update the files from bitkeeper %::SCCS/s.% - -all: make_win_src_distribution make_binary_distribution make_sharedlib_distribution |