diff options
| author | unknown <lenz@mysql.com> | 2005-07-21 10:15:08 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-07-21 10:15:08 +0200 |
| commit | 13ed403f4db2e86ffd1313318183f4b15bfc2a34 (patch) | |
| tree | 04f0c6e721ef8b38fbc242d73c8e0cff757e478a | |
| parent | 31ebc6ef71afaf4605ab5d00ddaf8d548683212d (diff) | |
| parent | 8a1a13e57005234458db17cbdbc45cc45eba53f6 (diff) | |
| download | mariadb-git-13ed403f4db2e86ffd1313318183f4b15bfc2a34.tar.gz | |
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
| -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 |