From d207bd81f8c2dedf200208931d489b1f8800d2f6 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 20 Jul 2005 19:15:48 +0200 Subject: [PATCH] - don't install the Mac OS X support files when running "make install" - they're not needed outside of the source tree (BUG#12057) - Removed some more unneeded files from "make install" along the way scripts/Makefile.am: - don't install the following files with "make install", as they are not needed to be installed: make_win_src_distribution, make_win_binary_distribution, make_binary_distribution, make_sharedlib_distribution support-files/MacOSX/Makefile.am: - don't install the Mac OS X support files when running "make install" - they're not needed outside of the source tree (BUG#12057) support-files/Makefile.am: - don't install the RPM spec files with "make install" - they are not needed outside of the source tree --- scripts/Makefile.am | 6 +----- support-files/MacOSX/Makefile.am | 6 ------ 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