diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-18 13:57:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-18 13:57:15 +0200 |
| commit | 197469231675658bd353d225ec7f6bca1dbbd14f (patch) | |
| tree | 671fc6fdced0a3a2cbb9e0cdd76660f594bb6276 /ure | |
| parent | b850ab574c11cf1d597035eca875181c6de31ea6 (diff) | |
Adapt env var settings to MS command shell syntax
Change-Id: Ie6d761a436a3c1b06f0da1dac7c93c50789230dd
Diffstat (limited to 'ure')
| -rw-r--r-- | ure/source/uretest/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile index 1db5282d3a85..98d0cca41a95 100644 --- a/ure/source/uretest/Makefile +++ b/ure/source/uretest/Makefile @@ -71,12 +71,17 @@ test-javatest: out.sdk/javamain.uno.jar out.sdk/types.rdb out.sdk/services.rdb -env:URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \ -env:URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb +ifeq "$(PLATFORM)" "windows" +set_vars = set URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb && \ + set URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb && +else +set_vars = URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \ + URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb +endif .PHONY: test-javanative test-javanative: out.sdk/runner.jar out.sdk/javanative.jar \ out.sdk/services.rdb out.sdk/types.rdb - URE_MORE_TYPES=$(URLPREFIX)$(cwd)/out.sdk/types.rdb \ - URE_MORE_SERVICES=$(URLPREFIX)$(cwd)/out.sdk/services.rdb \ - $(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar \ + $(set_vars) $(GCCS_COMPAT) $(SDK_JAVA) -jar out.sdk/runner.jar \ $(ure_java_url)/ $(URLPREFIX)$(cwd)/out.sdk/javanative.jar do_server = $(GCCS_COMPAT) uno -c test.cpp.cppserver.Component \ |