diff options
| author | unknown <lenz@mysql.com> | 2005-07-21 10:15:28 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-07-21 10:15:28 +0200 |
| commit | 8bdfffbe24b5119e7f089493b3ff810d3f4a631f (patch) | |
| tree | bb040839b0a8675743ba12d60f07c3e0c150f856 | |
| parent | af1dfb613b7ce6343f461d6f4c3def6af9354814 (diff) | |
| parent | d207bd81f8c2dedf200208931d489b1f8800d2f6 (diff) | |
| download | mariadb-git-8bdfffbe24b5119e7f089493b3ff810d3f4a631f.tar.gz | |
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
| -rw-r--r-- | scripts/Makefile.am | 6 | ||||
| -rw-r--r-- | support-files/MacOSX/Makefile.am | 6 | ||||
| -rw-r--r-- | support-files/Makefile.am | 4 |
3 files changed, 2 insertions, 14 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index c464c271a55..533545aba25 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -32,9 +32,7 @@ bin_SCRIPTS = @server_scripts@ \ mysqldumpslow \ mysql_explain_log \ mysql_tableinfo \ - mysqld_multi \ - make_win_src_distribution \ - make_win_binary_distribution + mysqld_multi EXTRA_SCRIPTS = make_binary_distribution.sh \ make_sharedlib_distribution.sh \ @@ -63,8 +61,6 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \ mysqlaccess.conf \ mysqlbug -pkgdata_DATA = make_binary_distribution make_sharedlib_distribution - # mysqlbug should be distributed built so that people can report build # failures with it. CLEANFILES = @server_scripts@ \ diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am index 4cdd7348cd7..a4915deccf6 100644 --- a/support-files/MacOSX/Makefile.am +++ b/support-files/MacOSX/Makefile.am @@ -28,12 +28,6 @@ EXTRA_DIST = Info.plist.sh \ StartupItem.Info.plist \ StartupItem.postinstall -pkgdata_DATA = Info.plist \ - Description.plist \ - StartupParameters.plist \ - postinstall \ - preinstall - CLEANFILES = Info.plist \ Description.plist \ StartupParameters.plist \ diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 1f38b4c30c2..59ee837825b 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -37,9 +37,7 @@ pkgdata_DATA = my-small.cnf \ my-huge.cnf \ my-innodb-heavy-4G.cnf \ mysql-log-rotate \ - mysql-@VERSION@.spec \ - binary-configure \ - MySQL-shared-compat.spec + binary-configure pkgdata_SCRIPTS = mysql.server |