fixed bundles dependency

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

diff --git a/build/bakefiles/mac_bundles.bkl b/build/bakefiles/mac_bundles.bkl
index 586c72f2294fa6f56f6db61b3973d63077c75a06..4cf6485105b20b39bc82d4473b23f98b80e0a344 100644 (file)
--- a/build/bakefiles/mac_bundles.bkl
+++ b/build/bakefiles/mac_bundles.bkl
@@ -29,9 +29,10 @@
 
         <!-- bundle directory: -->
         <set var="BUNDLE">$(id).app/Contents</set>
+        <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
         
-        <add-target target="$(BUNDLE)" type="action"/>
-        <modify-target target="$(BUNDLE)">            
+        <add-target target="$(BUNDLE_TGT)" type="action"/>
+        <modify-target target="$(BUNDLE_TGT)">
             <!-- required data: -->
             <depends>$(id)</depends>
             <depends-on-file>$(BUNDLE_PLIST)</depends-on-file>
@@ -67,7 +68,7 @@
                     cond="PLATFORM_MACOSX=='1'"/>
         <modify-target target="$(id)_bundle">
             <dependency-of>all</dependency-of>
-            <depends>$(BUNDLE)</depends>
+            <depends>$(BUNDLE_TGT)</depends>
         </modify-target>
 
         <!-- "make clean" should delete the bundle: -->

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 1039fd36337aefc2ef902946fc52244bb2e135c6..8fda3de4bdfb0e37ba1b672200d0437b61495b65 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -118,7 +118,7 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
        $(__minimal___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-minimal.app/Contents: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p minimal.app/Contents
        mkdir -p minimal.app/Contents/MacOS
        mkdir -p minimal.app/Contents/Resources
@@ -139,7 +139,7 @@ minimal.app/Contents: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc minimal.app/Contents/Resources/minimal.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns minimal.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@minimal_bundle: minimal.app/Contents
+@COND_PLATFORM_MACOSX_1@minimal_bundle: minimal.app/Contents/PkgInfo
 
 minimal_minimal.o: $(srcdir)/minimal.cpp
        $(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $<