X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/065a32a58f472d9b5dc3a60c686107aa7524f24e..5171553c22dca07d136dc2da9dc83bb3c04f0319:/build/bakefiles/wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 30358874cb..d92d892f2c 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -12,21 +12,22 @@
     </phony>
 
     <set var="BUILDING_LIB">1</set>
-
+    
     <!-- common rules, names etc. for wx: -->
     <include file="common.bkl"/>
-
+    
     <!-- list of files sorted into categories: -->
     <include file="files.bkl"/>
-
+    
     <!-- wxWindows variant where everything is in one library: -->
     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
     <!-- OpenGL canvas is built as separate library in both cases: -->
     <include file="opengl.bkl"/>
-    
-    
+    <!-- Dynamically loadable plugins: -->
+    <include file="plugins.bkl"/>
+ 
     <!-- Samples target (not dependency of 'all'): -->
     <subproject id="samples">
         <installable>no</installable>
@@ -54,9 +55,9 @@
         <action id="install-wxconfig">
             <dependency-of>install</dependency-of>
             <command>
-                $(INSTALL_DIR) $(BINDIR)
-                $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(BINDIR)
-                (cd $(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
+                $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+                $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(BINDIR)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
             </command>
         </action>
 
@@ -129,27 +130,32 @@
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
-        <mkdir id="libdir_wx">
+        <mkdir id="libdir_setup">
             <depends>libdir</depends>
+            <dir>$(SETUPHDIR)</dir>            
+        </mkdir>
+        <mkdir id="libdir_setup_wx">
+            <depends>libdir_setup</depends>
             <dependency-of>setup_h</dependency-of>
-            <dir>$(LIBDIRNAME)/wx</dir>            
+            <dir>$(SETUPHDIR)/wx</dir>            
         </mkdir>
 
-        <set var="SETUP_H_DIR">
+        <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
             <if cond="WXUNIV=='0'">msw</if>
         </set>
         
         <copy-file-to-file-if-not-exist id="master_setup.h">
-            <src>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup0.h</src>
-            <dst>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup.h</dst>
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h</src>
+            <dst>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</dst>
             <dependency-of>setup_h</dependency-of>
         </copy-file-to-file-if-not-exist>
         <copy-file-to-file-if-not-exist id="setup.h">
             <dependency-of>setup_h</dependency-of>
-            <src>$(SRCDIR)/include/wx/$(SETUP_H_DIR)/setup.h</src>
-            <dst>$(LIBDIRNAME)/wx/setup.h</dst>
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
+            <dst>$(SETUPHDIR)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>
+
     </if>
 
 
@@ -159,6 +165,8 @@
         <modify-target target="install">
             <command>
 @echo " "
+@echo " ------------------------------------------------------"
+@echo " "
 @echo " The installation of wxWindows is finished.  On certain"
 @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
 @echo " if you installed a shared library and also modify the"
@@ -168,6 +176,8 @@
 @echo " to be suitable for any purpose."
 @echo " "
 @echo " Read the wxWindows Licence on licencing conditions."
+@echo " "
+@echo " ------------------------------------------------------"
 @echo " "
             </command>
         </modify-target>
@@ -179,5 +189,7 @@
         <fragment format="autoconf" file="make_dist.mk"/>
 
     </if>
+        
+    <include file="build_cfg.bkl"/>
 
 </makefile>