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

Timestamp:

Jul 19, 2011, 7:07:23 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: No need to put QMAKE_PRL_BUILD_DIR to .prl when targeting OS/2.

This avoids possible confusion when the .prl is installed on the end
user's machine since QMAKE_PRL_BUILD_DIR would contain a path to a
directory on the build machine which is most likely invalid anywhere
else.

File:

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

trunk/qmake/generators/makefile.cpp

@@ -964 +964 @@
     if(slsh != -1)
         target.remove(0, slsh + 1);
-    QString bdir = Option::output_dir;
-    if(bdir.isEmpty())
-        bdir = qmake_getpwd();
-    t << "QMAKE_PRL_BUILD_DIR = " << bdir << endl;
+
+    if (Option::target_mode != Option::TARG_OS2_MODE) {
+        // QMAKE_PRL_BUILD_DIR is not used on OS/2 so don't add it to avoid
+        // possible confusion by exposing the full path to the build directory
+        QString bdir = Option::output_dir;
+        if(bdir.isEmpty())
+            bdir = qmake_getpwd();
+        t << "QMAKE_PRL_BUILD_DIR = " << bdir << endl;
+    }
 
     if(!project->projectFile().isEmpty() && project->projectFile() != "-")