Some more fixes for OS/2.

[wxWidgets.git] / build / bakefiles / wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 30358874cb1faf2f53219160a9496d2f61515e77..53f72b47f68b6c9a3a969cbae8dff5f5faf6c2cd 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -129,26 +129,30 @@
         <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 +163,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 +174,8 @@
 @echo " to be suitable for any purpose."
 @echo " "
 @echo " Read the wxWindows Licence on licencing conditions."
+@echo " "
+@echo " ------------------------------------------------------"
 @echo " "
             </command>
         </modify-target>