instsetoo_native/util/makefile.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 53a5bf7529255e59d63645ee6a453ed56df39a9d
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed Dec 26 02:51:19 2012 +0200
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
diff --git a/instsetoo_native/util/makefile.mk
b/instsetoo_native/util/makefile.mk
index 574ce4c..ea1022b0 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
