diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-03-19 13:46:36 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2014-03-19 13:38:35 +0000 |
| commit | d2c16eb81a813f709552bd840897047fe98eb131 (patch) | |
| tree | 6b051ee2721c9a6ef519c2377d1154c07270541b /solenv | |
| parent | 3e92847d75e8703d0537d5411d1f98bd1cd0402a (diff) | |
use $(value ...) to reduce escalating double-quoting of dollars
Change-Id: I92b4c1be5d8e051a4d716900bcc5dd7bb621017b
Reviewed-on: https://gerrit.libreoffice.org/8658
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index aee3edfdbd4d..708779f265ee 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -41,7 +41,7 @@ $(call gb_JunitTest_get_target,%) : (DBGSV_ERROR_OUT=shell DISABLE_SAL_DBGBOX=t \ $(gb_JunitTest_JAVACOMMAND) \ -classpath "$(T_CP)" \ - $(DEFS) \ + $(value DEFS) \ org.junit.runner.JUnitCore \ $(CLASSES) > $@.log 2>&1 || \ (cat $@.log \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index fb617ac9e85b..7288cf61f43a 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -401,8 +401,8 @@ endif define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ - -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}" \ - -Dorg.openoffice.test.arg.env=PATH="$$$$PATH" \ + -Dorg.openoffice.test.arg.soffice="$${OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}" \ + -Dorg.openoffice.test.arg.env=PATH="$$PATH" \ -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) endef diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 8d6f8341ce01..33b3870b8e00 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -299,7 +299,7 @@ endif define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ -Dorg.openoffice.test.arg.soffice="$(gb_JunitTest_SOFFICEARG)" \ - -Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH"$$$${DYLD_LIBRARY_PATH+=$$$$DYLD_LIBRARY_PATH}" \ + -Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH"$${DYLD_LIBRARY_PATH+=$$DYLD_LIBRARY_PATH}" \ -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 318e630547ab..8168e4af399d 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -321,7 +321,7 @@ endif define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ - -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ + -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ -Dorg.openoffice.test.arg.postprocesscommand=$(SRCDIR)/solenv/bin/gdb-core-bt.sh \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0de4a72e41e6..63c223e65265 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -319,7 +319,7 @@ endif define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ - -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ + -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ -Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1))) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ -Dorg.openoffice.test.arg.postprocesscommand=$(SRCDIR)/solenv/bin/gdb-core-bt.sh \ |