X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92a50a3990f5c1a96f8533680b5cabe28245cfdc..45fb81e55662c9df401208d9de82c953651cf77a:/build/bakefiles/wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 1df6355a62..8b8b4cdcb6 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -43,14 +43,30 @@
         <dir cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">../../samples</dir>
     </subproject>
     
-    <!-- WXRC compiler is built by default: -->
-    <subproject id="wxrc" cond="FORMAT=='autoconf' and USE_XRC=='1'">
-        <dependency-of>all</dependency-of>
-        <installable>yes</installable>
-        <dir>utils/wxrc</dir>
-    </subproject>
-
-    <if cond="FORMAT=='autoconf'">       
+    <if cond="FORMAT=='autoconf'">
+    
+        <!-- WXRC compiler is built by default: -->
+        <!-- FIXME: this is dirty hack, better bakefile support for
+             conditional and optional subprojects is needed -->
+        <action id="wxrc" cond="USE_XRC=='1'">
+            <dependency-of>all</dependency-of>
+            <command>
+                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
+            </command>
+        </action>
+        <action id="clean-wxrc" cond="USE_XRC=='1'">
+            <dependency-of>clean</dependency-of>
+            <command>
+                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean) || true
+            </command>
+        </action>
+        <action id="install-wxrc" cond="USE_XRC=='1'">
+            <dependency-of>install</dependency-of>
+            <command>
+                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
+            </command>
+        </action>
+    
         <!-- "make install": -->
 
         <data-files>
@@ -60,11 +76,11 @@
 
         <data-files-tg id="install-afm" cond="USE_GUI=='1'">
             <files>misc/afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/$(WX_RELEASE)/afm</install-to>
+            <install-to>$(DATADIR)/wx/afm</install-to>
         </data-files-tg>
         <data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
             <files>misc/gs_afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/$(WX_RELEASE)/gs_afm</install-to>
+            <install-to>$(DATADIR)/wx/gs_afm</install-to>
         </data-files-tg>
 
         <action id="install-wxconfig">