]> git.saurik.com Git - wxWidgets.git/blobdiff - build/bakefiles/wx.bkl
Untabified (TABs seem to cause strange problems with autoconf-2.59, at least
[wxWidgets.git] / build / bakefiles / wx.bkl
index 8e517de8d63bfa1725c120d085b81373076e81fd..56866d9f743ce4c8dc3e4b493485d61772b6d0fc 100644 (file)
@@ -40,7 +40,7 @@
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>
-        <dir cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">../../samples</dir>
     </subproject>
 
     <if cond="FORMAT=='autoconf'">       
             <command>
                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
-                $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_NAME) $(DESTDIR)$(LIBDIR)/wx/config
-                $(INSTALL_PROGRAM) wx-config $(DESTDIR)$(BINDIR)
+                $(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(LIBDIR)/wx/config
+                (cd $(DESTDIR)$(LIBDIR)/wx/config &amp;&amp; rm -f $(TOOLCHAIN_NAME) &amp;&amp; $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
+                $(INSTALL_PROGRAM) wx-config-$(WXVER_MAJOR).$(WXVER_MINOR) $(DESTDIR)$(BINDIR)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx-config-$(WXVER_MAJOR).$(WXVER_MINOR) wx-config)
                 (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx$(TOOLCHAIN_NAME)-config &amp;&amp; $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config)
             </command>
         </action>
@@ -80,6 +82,9 @@
         <headers>
             <srcdir>$(SRCDIR)/include</srcdir>
             <files>$(ALL_HEADERS)</files>
+            <install-to>
+                $(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)
+            </install-to>
         </headers>
 
         <!-- Locales: -->
     </if>
 
 
-    <!-- copy setup.h on Windows: -->    
-    <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+    <!-- copy setup.h on DOS/Windows: -->    
+    <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
 
         <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
-            <if cond="WXUNIV=='0'">msw</if>
+            <if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
         </set>
         
         <copy-file-to-file-if-not-exist id="master_setup.h">