fixed wx-config installation

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 8cb6872adc76a22a618bcf6b02a1306b3872b908..690529d5f8bbf1c14a578eb3455afb632c40b358 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -98,10 +98,6 @@
         <if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
     </set>
 
-    <set var="TOOLCHAIN_NAME">
-        $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
-    </set>
-
     
     <!-- =============================================================== -->
     <!--                    Names of component libraries:                -->

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 66f4388b235ccd27a3d1752f0478117f2a0c61ff..45ffbc0750f68d719f20967bd6c1686484625d62 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -81,6 +81,7 @@
         <option name="TOOLKIT"/>
         <option name="TOOLKIT_LOWERCASE"/>
         <option name="TOOLKIT_VERSION"/>
+        <option name="TOOLCHAIN_NAME"/>
         <option name="EXTRALIBS"/>
         <option name="EXTRALIBS_GUI"/>
         <option name="SAMPLES_RPATH_FLAG"/>