Changeset 199 for trunk/qmake/generators/makefile.cpp

Timestamp:

Oct 5, 2009, 8:27:34 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Always pass $(MAKEFILE) as argument in custom defined tragets as it's not necessarily Makefile [vendor bug].

File:

• trunk/qmake/generators/makefile.cpp (modified) (1 diff)

trunk/qmake/generators/makefile.cpp

@@ -2564 +2564 @@
                 MAKE_CD_IN_AND_OUT(out_directory);
 
-                //don't need the makefile arg if it isn't changed
-                QString makefilein;
-                if(subtarget->makefile != "$(MAKEFILE)")
-                    makefilein = " -f " + subtarget->makefile;
+                // note that we always pass the makefile as argument since it's
+                // hard to tell if it matches the platform make's default
+                // file name or not (and it can be also specified indirectly
+                // through $(MAKEFILE))
+                QString makefilein = " -f " + subtarget->makefile;
 
                 //write the rule/depends