X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee929bcff4394798c02c0c9bbca6d345eac933c2..9513c5b609740c15322f2284e5e8b9609eeaa069:/build/bakefiles/wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index feded73cb9..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>
 
@@ -154,6 +155,7 @@
             <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
             <dst>$(SETUPHDIR)/wx/setup.h</dst>
         </copy-file-to-file-if-not-exist>
+
     </if>
 
 
@@ -163,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"
@@ -172,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>
@@ -183,5 +189,7 @@
         <fragment format="autoconf" file="make_dist.mk"/>
 
     </if>
+        
+    <include file="build_cfg.bkl"/>
 
 </makefile>