Changeset 292

Timestamp:

Nov 6, 2009, 3:03:15 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/GNUMAKE/os/2: Add the MAKEFILE variable to the generated make file that contains its name. Always convert separators to native when escaping paths for the DOS-like command processors.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -77 +77 @@
         ret.replace(' ', "\\ ");
     } else {
+
         ret.replace(QRegExp("\""), "");
         ret.replace(QRegExp("[\\\\/]$"), "");
@@ -276 +277 @@
 void GNUMakefileGenerator::writeGNUParts(QTextStream &t)
 {
-    t << "QMAKESPECDIR  = " << quote << specdir() << quote << endl << endl;
+    t << "QMAKESPECDIR  = " << escapeFilePath(specdir()) << endl;
+
+    QString ofile = escapeFilePath(Option::output.fileName());
+    if(ofile.lastIndexOf(Option::dir_sep) != -1)
+        ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) -1);
+    t << "MAKEFILE      = " << ofile << endl << endl;
 
     writeStandardParts(t);