diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-29 08:33:45 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-12 10:00:34 (GMT) |
| commit | 430b743946178c3f05208434331b8017159612b1 (patch) | |
| tree | 0ddd0dc6565a84237d341de1bd25e57bcc38609e /qmake/generators | |
| parent | 9df9d83085ff6164d83c35d51df539858ae398e4 (diff) | |
| download | Qt-430b743946178c3f05208434331b8017159612b1.zip Qt-430b743946178c3f05208434331b8017159612b1.tar.gz Qt-430b743946178c3f05208434331b8017159612b1.tar.bz2 | |
dist target: fixify OBJECTS_DIR against output dir
the thing is terminally broken anyway, but whatever
Reviewed-by: mariusSO
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index c660855..c0c0aaa 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -787,7 +787,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) ddir = project->first("QMAKE_DISTDIR"); QString ddir_c = escapeFilePath(fileFixify((project->isEmpty("OBJECTS_DIR") ? QString(".tmp/") : - project->first("OBJECTS_DIR")) + ddir)); + project->first("OBJECTS_DIR")) + ddir, + Option::output_dir, Option::output_dir)); t << "dist: " << "\n\t" << mkdir_p_asstring(ddir_c) << "\n\t" << "$(COPY_FILE) --parents $(SOURCES) $(DIST) " << ddir_c << Option::dir_sep << " && "; |