diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-01-10 15:41:54 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-10 15:41:54 (GMT) |
| commit | 89886a34d7c4fdacc472f6e1498bc0769f2302ad (patch) | |
| tree | 1d83f7a16292bffa17e6d4d84720043bd98a229f | |
| parent | 13370ead4e9184fd82c08c060dbb1ea29a51cc7c (diff) | |
| download | Qt-89886a34d7c4fdacc472f6e1498bc0769f2302ad.zip Qt-89886a34d7c4fdacc472f6e1498bc0769f2302ad.tar.gz Qt-89886a34d7c4fdacc472f6e1498bc0769f2302ad.tar.bz2 | |
qmake: fix double directory separator
Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 7c68316..009d4b5 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1353,8 +1353,13 @@ UnixMakefileGenerator::pkgConfigFileName(bool fixify) if(dot != -1) ret = ret.left(dot); ret += Option::pkgcfg_ext; - if(!project->isEmpty("QMAKE_PKGCONFIG_DESTDIR")) - ret.prepend(project->first("QMAKE_PKGCONFIG_DESTDIR") + Option::dir_sep); + QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR"); + if(!subdir.isEmpty()) { + // initOutPaths() appends dir_sep, but just to be safe.. + if (!subdir.endsWith(Option::dir_sep)) + ret.prepend(Option::dir_sep); + ret.prepend(subdir); + } if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR")); |