Changeset 410

Timestamp:

Dec 10, 2009, 9:45:42 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Don't generate Makefile from qmake.pro too early: it won't be able to properly resolve Qt library names if their .prls are absent.

File:

• trunk/configure.cmd (modified) (1 diff)

trunk/configure.cmd

@@ -1746 +1746 @@
         call Done 2
 
-    if (pos("qmake", G.CFG_BUILD_PARTS) > 0) then do
-        /* generate the qmake makefile as well to overwrite the bootstrapped Makefile */
-        str = G.OutPath"\bin\qmake.exe" G.RelPath"\qmake\qmake.pro -o" G.OutPath"\qmake\Makefile"
-        say str
-        address "cmd" str
-        make_rc = rc
-        /* exit on failure */
-        if (make_rc \= 0)  then
-            call Done 2
-    end
+    if (pos("qmake", G.CFG_BUILD_PARTS) > 0) then
+        /* we need to delete the bootstrapped Makefile so that a proper one will
+         * be generated from qmake.pro when it's time for it */
+        call DeleteFile G.OutPath"\qmake\Makefile"
 
     /* generate the immediate child makefiles, otherwise 'make release|debug'