better fix for macos resources

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

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index ce049f7410fcfb12b0ba22eac384ed456bf833e0..47c4f07dd4ce1b503e0fc6d5eeb3093e284daf12 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -13,7 +13,7 @@
     <if cond="FORMAT=='autoconf'">
         <set var="MACOSX_RESOURCES">
             <if cond="TOOLKIT=='MAC'">
     <if cond="FORMAT=='autoconf'">
         <set var="MACOSX_RESOURCES">
             <if cond="TOOLKIT=='MAC'">

-                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r $(SRCDIR)/$(WXTOPDIR)samples/sample.r
+                Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r sample.r

             </if>
         </set>
     </if>
             </if>
         </set>
     </if>


@@ -30,7 +30,7 @@
     <template id="wx_util" template="wx_util_b">
         <app-type>gui</app-type>
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
     <template id="wx_util" template="wx_util_b">
         <app-type>gui</app-type>
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>

-        <include>$(WXTOPDIR)samples</include> <!-- for .rc files -->
+        <include>$(SRCDIR)/$(WXTOPDIR)samples</include> <!-- for .rc files -->

         <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
     </template>
     
         <win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
     </template>