diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-29 10:53:00 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:46:06 +0200 |
commit | a40469ce57411e2bfa6d31534c0702254e3b4859 (patch) | |
tree | a05a03ee8097750a0298bf8ff1afe24aac23f709 | |
parent | 76f0ce06e2e75a3f99ea87fa4ef4ebcfdf758db2 (diff) |
unobfuscate makefiles re $(CHK_DIR_EXISTS)
no need to define an obscure variable for it. just inline it.
the assignments are left in for compatibility with hand-written commands.
Change-Id: I9bc3914e2c4116f3b8fe00a421ca0f036bb7e214
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r-- | qmake/generators/makefile.cpp | 5 | ||||
-rw-r--r-- | qmake/generators/makefile.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index a3e4b117ef..0911bdf18f 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -93,7 +93,7 @@ bool MakefileGenerator::canExecute(const QStringList &cmdline, int *a) const QString MakefileGenerator::mkdir_p_asstring(const QString &dir, bool escape) const { - QString ret = "@$(CHK_DIR_EXISTS) "; + QString ret = "@" + chkdir + " "; if(escape) ret += escapeFilePath(dir); else @@ -431,6 +431,9 @@ MakefileGenerator::init() init_already = true; QHash<QString, QStringList> &v = project->variables(); + + chkdir = v["QMAKE_CHK_DIR_EXISTS"].join(" "); + QStringList &quc = v["QMAKE_EXTRA_COMPILERS"]; //make sure the COMPILERS are in the correct input/output chain order diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 64ed2dd30a..44fba2d93b 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -81,6 +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 build_args(const QString &outdir=QString()); void checkMultipleDefinition(const QString &, const QString &); |