introduce $$QMAKE_CHK_EXISTS_GLUE

instead of hard-coding platform differences, use a variable.

Change-Id: I20e98811ad5f07429148c6f88aedbabc3ba58fff
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/mkspecs/common/shell-unix.conf b/mkspecs/common/shell-unix.conf
index a894867..967a658 100644 (file)
--- a/mkspecs/common/shell-unix.conf
+++ b/mkspecs/common/shell-unix.conf
@@ -8,5 +8,6 @@ QMAKE_MOVE             = mv -f
 QMAKE_DEL_FILE         = rm -f
 QMAKE_DEL_DIR          = rmdir
 QMAKE_CHK_DIR_EXISTS   = test -d
+QMAKE_CHK_EXISTS_GLUE  = "|| "
 QMAKE_MKDIR            = mkdir -p
 QMAKE_STREAM_EDITOR    = sed

diff --git a/mkspecs/common/shell-win32.conf b/mkspecs/common/shell-win32.conf
index ee13754..16f86e5 100644 (file)
--- a/mkspecs/common/shell-win32.conf
+++ b/mkspecs/common/shell-win32.conf
@@ -6,4 +6,5 @@ QMAKE_MOVE             = move
 QMAKE_DEL_FILE         = del
 QMAKE_DEL_DIR          = rmdir
 QMAKE_CHK_DIR_EXISTS   = if not exist
+QMAKE_CHK_EXISTS_GLUE  =
 QMAKE_MKDIR            = mkdir

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 7b29615..a14e723 100644 (file)
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -98,12 +98,7 @@ QString MakefileGenerator::mkdir_p_asstring(const QString &dir, bool escape) con
         ret += escapeFilePath(dir);
     else
         ret += dir;
-    ret += " ";
-    if(isWindowsShell())
-        ret += "$(MKDIR)";
-    else
-        ret += "|| $(MKDIR)";
-    ret += " ";
+    ret += " " + chkglue + "$(MKDIR) ";
     if(escape)
         ret += escapeFilePath(dir);
     else
@@ -433,6 +428,9 @@ MakefileGenerator::init()
     QHash<QString, QStringList> &v = project->variables();
 
     chkdir = v["QMAKE_CHK_DIR_EXISTS"].join(" ");
+    chkglue = v["QMAKE_CHK_EXISTS_GLUE"].join(" ");
+    if (chkglue.isEmpty()) // Backwards compat with Qt4 specs
+        chkglue = isWindowsShell() ? "" : "|| ";
 
     QStringList &quc = v["QMAKE_EXTRA_COMPILERS"];
 

diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 44fba2d..3a41fb4 100644 (file)
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -81,7 +81,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo
     QString spec;
     bool init_opath_already, init_already, no_io;
     QHash<QString, bool> init_compiler_already;
-    QString chkdir;
+    QString chkdir, chkglue;
     QString build_args(const QString &outdir=QString());
     void checkMultipleDefinition(const QString &, const QString &);