Index: pyuno/test/makefile.mk
===================================================================
RCS file: /cvs/udk/pyuno/test/makefile.mk,v
retrieving revision 1.2
diff -u -r1.2 makefile.mk
--- pyuno/test/makefile.mk	6 Apr 2003 17:20:26 -0000	1.2
+++ pyuno/test/makefile.mk	1 Jul 2003 08:08:04 -0000
@@ -74,25 +74,40 @@
 .INCLUDE :  sv.mk
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)" == "UNX"
 DOLLAR_SIGN=\$$
+.IF "$(GUI)" == "UNX"
 INI_EXT=rc
 .ELSE
 INI_EXT=.ini
 PYEXC=$(DLLDEST)$/python.exe
 REGEXC=$(DLLDEST)$/regcomp.exe
+.ENDIF
+.IF "$(USE_SHELL)" != "tcsh"
 DOLLAR_SIGN=$$
 .ENDIF
 
+#these are temporary
+REGCOMP=$(WRAPCMD) regcomp
+PYTHON=$(WRAPCMD) python
+
 .IF "$(GUI)"!="WNT"
 REGCOMP_ENV=\
 	setenv FOO file://$(shell pwd)$/$(DLLDEST)
 .ELSE # "$(GUI)" != "WNT"
 # aaaaaa, how to get the current working directory on windows ???
-CWD_TMP=$(shell echo import os;print os.getcwd() | python )
+.IF "$(USE_SHELL)" == "tcsh"
+
+# these are temporary (should go into the global env script)
+##PYTHON=guw.pl -env $(SOLARVER)/$(UPD)/$(INPATH)/bin/python.exe
+##REGCOMP=guw.pl -env `which regcomp.exe`
+
+CWD_TMP=$(strip $(shell $(WRAPCMD) echo `pwd`))
+REGCOMP_ENV=setenv FOO file:///$(strip $(subst,\,/ $(CWD_TMP)/$(DLLDEST)))
+.ELSE
+CWD_TMP=$(strip $(shell echo import os;print os.getcwd() | $(PYTHON)))
 REGCOMP_ENV=set FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST)))
+.ENDIF "$(USE_SHELL)" == "tcsh"
 
-#$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))
 .ENDIF  # "$(GUI)"!="WNT"
 PYFILES = \
 	$(DLLDEST)$/core.py			\
@@ -139,9 +154,9 @@
 	@echo start test with  dmake runtest
 
 runtest : ALL
-	+cd $(DLLDEST) && python main.py
-	+cd $(DLLDEST) && regcomp -register -br pyuno_regcomp.rdb -r dummy.rdb \
+	+cd $(DLLDEST) && $(PYTHON) main.py
+	+cd $(DLLDEST) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \
 			-l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i))
-	+cd $(DLLDEST) && $(REGCOMP_ENV) && regcomp -register -br pyuno_regcomp.rdb -r dummy2.rdb \
+	+cd $(DLLDEST) && $(REGCOMP_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \
 			-l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py