diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-21 15:26:18 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-21 15:26:18 +0100 |
commit | fb9cff6e88699b57b5dbc05d79c7958a2deacd71 (patch) | |
tree | b0dbd28d8c36eabf4eab750e68ac2e7cf886e1e5 /mkspecs/common/shell-unix.conf | |
parent | da2f627ba2117b6ef1791ff8971df2fc68c29d10 (diff) | |
parent | 2ab9b747fcc5aa50e8cca758f7780158e734a222 (diff) |
Merge "Merge remote-tracking branch 'gerrit/release' into stable" into refs/staging/stable
Diffstat (limited to 'mkspecs/common/shell-unix.conf')
-rw-r--r-- | mkspecs/common/shell-unix.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/common/shell-unix.conf b/mkspecs/common/shell-unix.conf index 17c3612fdc..63c435d037 100644 --- a/mkspecs/common/shell-unix.conf +++ b/mkspecs/common/shell-unix.conf @@ -7,8 +7,8 @@ QMAKE_COPY_DIR = $$QMAKE_COPY -R QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_CHK_FILE_EXISTS = test -f -QMAKE_CHK_EXISTS_GLUE = "|| " -QMAKE_MKDIR = mkdir -p +QMAKE_CHK_EXISTS = test -e %1 || +QMAKE_CHK_DIR_EXISTS = test -d # legacy +QMAKE_MKDIR = mkdir -p # legacy +QMAKE_MKDIR_CMD = test -d %1 || mkdir -p %1 QMAKE_STREAM_EDITOR = sed |