summaryrefslogtreecommitdiff
path: root/smoketest/CppunitTest_smoketest.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-05-09 23:15:42 +0200
committerMichael Stahl <mstahl@redhat.com>2012-05-10 10:47:44 +0200
commita9550f63cd7a7e064901b2c997375ed384781eea (patch)
treeb35a7bf6077c5b40390cbde11dffe30ef90d57c9 /smoketest/CppunitTest_smoketest.mk
parentce1ac0851fe2e975f3fb47178730b914608610cf (diff)
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'smoketest/CppunitTest_smoketest.mk')
-rw-r--r--smoketest/CppunitTest_smoketest.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index 71a7bcef2980..aa27bef2e773 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -39,15 +39,15 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
))
ifeq ($(OS),MACOSX)
-my_soffice:=path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice
+smoketest_SOFFICE := path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice
else
-my_soffice:=path:$(DEVINSTALLDIR)/opt/program/soffice
+smoketest_SOFFICE := path:$(DEVINSTALLDIR)/opt/program/soffice
endif
$(eval $(call gb_CppunitTest_use_ure,smoketest))
$(eval $(call gb_CppunitTest_add_arguments,smoketest,\
- -env:arg-soffice=$(my_soffice) \
+ -env:arg-soffice=$(smoketest_SOFFICE) \
-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
-env:arg-testarg.smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw \