Changeset 885 for trunk/qmake/generators/win32/winmakefile.cpp

Timestamp:

Jul 13, 2011, 1:49:44 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: win32/os2: Fixed: DESTDIR make variable would end with an unexpected space when the makefile is processed by a Unix-like make tool.

File:

• trunk/qmake/generators/win32/winmakefile.cpp (modified) (2 diffs)

trunk/qmake/generators/win32/winmakefile.cpp

@@ -660 +660 @@
     t << "DIST          = " << varList("DISTFILES") << endl;
     t << "QMAKE_TARGET  = " << var("QMAKE_ORIG_TARGET") << endl;
-    // The comment is important to maintain variable compatibility with Unix
-    // Makefiles, while not interpreting a trailing-slash as a linebreak
-    t << "DESTDIR        = " << escapeFilePath(destDir) << " #avoid trailing-slash linebreak" << endl;
+    t << "DESTDIR        = " << escapeFilePath(destDir) << endl;
     t << "TARGET         = " << escapeFilePath(target) << endl;
     t << "DESTDIR_TARGET = " << escapeFilePath(var("DEST_TARGET")) << endl;
@@ -880 +878 @@
     if(!ret.isEmpty()) {
         ret = unescapeFilePath(ret);
-        if(ret.contains(" "))
+        // Note: also quote paths ending with the backslash to avoid
+        // interpreting it as a linebreak
+        if(ret.contains(' ') || ret.endsWith('\\'))
             ret = "\"" + ret + "\"";
         debug_msg(2, "EscapeFilePath: %s -> %s", path.toLatin1().constData(), ret.toLatin1().constData());