Changeset 974

Timestamp:

Aug 12, 2011, 4:43:31 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Make QMAKESPECDIR always point to original mkspec.

This allows to avoid duplicating all the contents of mkspecs/os2-g++ in
mkspecs/default but only keep a dummy qmake.conf that refers to the original
one.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -301 +301 @@
          "$(subst +,\\+,$(subst $(space),\\ ,$(subst \",,$(1)))))))" << endl << endl;
 
-    t << "QMAKESPECDIR  = " << escapeFilePath(specdir()) << endl;
-
-    // MakefileGenerator::writeSubTargets() already puts the MAKEFILE definitoin
-    // but others don't; add it here since we use it within generated makefiles
-    if (project->first("TEMPLATE") != "subdirs") {
+    QString spec = specdir();
+    if (QFileInfo(spec).fileName() == "default") {
+        // use the real specdir; this allows to only have a dumb qmake.conf in
+        // the default mkspec dir and keep the rest in the real one (to avoid
+        // unnecessary duplication, in the absense of symlinks on OS/2)
+        QString origSpec = var("QMAKESPEC_ORIGINAL");
+        if (!origSpec.isEmpty())
+            spec = QDir::cleanPath(QDir(spec).absoluteFilePath(origSpec));
+    }
+    t << "QMAKESPECDIR  = " << escapeFilePath(spec) << endl;
+
+    // MakefileGenerator::writeSubTargets() already puts the MAKEFILE definition
+    // for subdirs-like makefiles but we also use it in normal ones
+    if (project->first("TEMPLATE") != "subdirs" &&
+        (project->isActiveConfig("build_pass") || project->values("BUILDS").isEmpty())) {
         QString ofile = escapeFilePath(Option::output.fileName());
         if(ofile.lastIndexOf(Option::dir_sep) != -1)