diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-26 02:51:19 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-26 02:54:34 +0200 |
| commit | 53a5bf7529255e59d63645ee6a453ed56df39a9d (patch) | |
| tree | 67f21ac0898f9303c65967d84c04d5c8f1a8587c /instsetoo_native | |
| parent | 7af975da68a51aa640ca6cd239f98ee1f7b9ef45 (diff) | |
Fix the MSVC build with --without-help
It tried to build helppack installer(s) anyway as it looked for "HELP"
in BUILD_TYPE and was fooled by the "DBGHELP".
Change-Id: I9a271a464a776f4f4dad8ea1bef662966b88f944
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 574ce4c3251d..ea1022b0e248 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -68,7 +68,10 @@ LOCALPYFILES= \ $(BIN)$/pythonloader.py .ENDIF -.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/HELP//)" +# We can be pretty sure that the "HELP" in BUILD_TYPE, if it is there, +# is surrounded by spaces. We can't look for just "HELP" here because +# then DBGHELP would match... +.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ HELP //)" OOOHELPPACK= OOODEVHELPPACK= .ELSE |