keep name of wxmac icon for application bundles unstead of renaming it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/Info.plist.in b/src/mac/Info.plist.in
index c18310af1826510f80b4bbfc8318e63d52a992c5..2be3d33364efebf4f4a4f8e71d1a9e514a38ddca 100644 (file)
--- a/src/mac/Info.plist.in
+++ b/src/mac/Info.plist.in
@@ -11,7 +11,7 @@
        <key>CFBundleExecutable</key>
        <string>EXECUTABLE</string>
        <key>CFBundleIconFile</key>
        <key>CFBundleExecutable</key>
        <string>EXECUTABLE</string>
        <key>CFBundleIconFile</key>

-       <string>EXECUTABLE.icns</string>
+       <string>wxmac.icns</string>

        <key>CFBundleName</key>
        <string>EXECUTABLE</string>
        <key>CFBundlePackageType</key>
        <key>CFBundleName</key>
        <string>EXECUTABLE</string>
        <key>CFBundlePackageType</key>

diff --git a/src/mac/carbon/Info.plist.in b/src/mac/carbon/Info.plist.in
index c18310af1826510f80b4bbfc8318e63d52a992c5..2be3d33364efebf4f4a4f8e71d1a9e514a38ddca 100644 (file)
--- a/src/mac/carbon/Info.plist.in
+++ b/src/mac/carbon/Info.plist.in
@@ -11,7 +11,7 @@
        <key>CFBundleExecutable</key>
        <string>EXECUTABLE</string>
        <key>CFBundleIconFile</key>
        <key>CFBundleExecutable</key>
        <string>EXECUTABLE</string>
        <key>CFBundleIconFile</key>

-       <string>EXECUTABLE.icns</string>
+       <string>wxmac.icns</string>

        <key>CFBundleName</key>
        <string>EXECUTABLE</string>
        <key>CFBundlePackageType</key>
        <key>CFBundleName</key>
        <string>EXECUTABLE</string>
        <key>CFBundlePackageType</key>

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 28219da896e14563b71adeee65d6605f85598e4f..01b798ca0d50bb4ba07588c76ffe4231efb8d93a 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -54,7 +54,7 @@ clean:
 #
 # Targets to build a Mac OS X application bundle
 #
 #
 # Targets to build a Mac OS X application bundle
 #

-bundle: $(BUNDLE)/MacOS/$(PROGRAM) $(BUNDLE)/Info.plist $(BUNDLE)/PkgInfo $(BUNDLE)/Resources/$(PROGRAM).rsrc $(BUNDLE)/Resources/$(PROGRAM).icns
+bundle: $(BUNDLE)/MacOS/$(PROGRAM) $(BUNDLE)/Info.plist $(BUNDLE)/PkgInfo $(BUNDLE)/Resources/$(PROGRAM).rsrc $(BUNDLE)/Resources/wxmac.icns

 
 $(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(top_builddir)/lib/@WX_TARGET_LIBRARY@
        @$(INSTALL) -d `dirname $@`
 
 $(BUNDLE)/Info.plist: $(top_srcdir)/src/$(TOOLKITDIR)/Info.plist.in $(top_builddir)/lib/@WX_TARGET_LIBRARY@
        @$(INSTALL) -d `dirname $@`


@@ -74,6 +74,6 @@ $(BUNDLE)/Resources/$(PROGRAM).rsrc: $(top_builddir)/lib/@WX_RESOURCES_MACOSX_DA
        @$(INSTALL) -d `dirname $@`
        cp $< $@
 
        @$(INSTALL) -d `dirname $@`
        cp $< $@
 

-$(BUNDLE)/Resources/$(PROGRAM).icns: $(top_srcdir)/src/$(TOOLKITDIR)/wxmac.icns
+$(BUNDLE)/Resources/wxmac.icns: $(top_srcdir)/src/$(TOOLKITDIR)/wxmac.icns

        @$(INSTALL) -d `dirname $@`
        cp $< $@
        @$(INSTALL) -d `dirname $@`
        cp $< $@