diff options
| author | unknown <lenz@mysql.com> | 2005-07-20 22:41:53 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-07-20 22:41:53 +0200 |
| commit | f3b94359abd5017fc5ac3b5845938dde02279047 (patch) | |
| tree | 6e774265956e69a9ef199589017bd9d26c07bef8 /support-files | |
| parent | 45a43c214d8fb033d7ff9a8b9c3855ab49dbc682 (diff) | |
| parent | 40a779e9e6c743eea32dd2a7905d2747dda8e319 (diff) | |
| download | mariadb-git-f3b94359abd5017fc5ac3b5845938dde02279047.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
scripts/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/MacOSX/Makefile.am | 6 | ||||
| -rw-r--r-- | support-files/Makefile.am | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am index b521d357022..86773f12339 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 5f5a10fc1fc..d83dd8ee74d 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -38,8 +38,7 @@ pkgdata_DATA = my-small.cnf \ my-huge.cnf \ my-innodb-heavy-4G.cnf \ mysql-log-rotate \ - mysql-@VERSION@.spec \ - MySQL-shared-compat.spec \ + binary-configure \ ndb-config-2-node.ini pkgdata_SCRIPTS = mysql.server |