Index: setup2/util/makefile.mk
===================================================================
RCS file: /cvs/installation/setup2/util/makefile.mk,v
retrieving revision 1.53
diff -u -r1.53 makefile.mk
--- setup2/util/makefile.mk	2 May 2003 15:25:37 -0000	1.53
+++ setup2/util/makefile.mk	10 May 2003 17:10:07 -0000
@@ -153,7 +153,7 @@
 SHL1STDLIBS += \
 		uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \
 		winmm.lib
-.ENDIF # "$(GUI)"=="UNX"
+.ENDIF # "$(GUI)"=="WNT"
 
 DEF1NAME    =$(SHL1TARGET)
 DEF1DEPN    =$(MISC)$/$(SHL1TARGET).flt
@@ -360,11 +360,19 @@
 	setenv CLASSPATH $(REGCOMP_CLASSPATH) && \
 	setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH):$(JDKLIB)
 .ELSE # "$(GUI)" != "WNT"
+.IF "$(USE_SHELL)" != "4nt"
+DOLLAR_SIGN=\$$
+REGCOMP_ENV=\
+	setenv CLASSPATH "$(strip $(subst,\,/ $(shell guw.pl echo $(REGCOMP_CLASSPATH))))" && \
+	setenv PATH "$(PATH):$(JREPATH)"
+MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(shell guw.pl echo $(SOLARBINDIR))))
+.ELSE # "$(USE_SHELL)" != "4nt"
 DOLLAR_SIGN=$$
 REGCOMP_ENV=\
 	set CLASSPATH=$(REGCOMP_CLASSPATH) && \
 	set PATH=$(PATH);$(JREPATH)
 MY_JAVA_COMPPATH=$(strip $(subst,\,/ file:///$(SOLARBINDIR)))
+.ENDIF  # "$(USE_SHELL)" != "4nt"
 .ENDIF  # "$(GUI)"!="WNT"
 .ENDIF  # "$(JAVANUMVER)" >= "000100040000"
 .ENDIF  # "$(SOLAR_JAVA)" != ""
@@ -375,16 +383,16 @@
 		$(foreach,i,$(REGISTERLIBS_JAVA) $(MY_DLLDIR)$/$(i))
 	-rm -f $@ $(BIN)$/regcomp.rdb $(BIN)$/setup_services.tmp
 # register the native libraries
-	regcomp -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS))"
+	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS))"
 .IF "$(SOLAR_JAVA)" != ""
 .IF "$(JAVANUMVER)" >= "000100040000"
-	regcomp -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS_JAVA))"
+	$(REGCOMP) -register -r $(BIN)$/setup_services.tmp -c "$(strip $(REGISTERLIBS_JAVA))"
 # prepare a registry which regcomp can work on (types+java services)
-	regcomp -register -r $(BIN)$/regcomp.rdb -c "$(strip $(REGISTERLIBS_JAVA))"
-	regmerge $(BIN)$/regcomp.rdb / $(SOLARBINDIR)/udkapi.rdb
+	$(REGCOMP) -register -r $(BIN)$/regcomp.rdb -c "$(strip $(REGISTERLIBS_JAVA))"
+	$(REGMERGE) $(BIN)$/regcomp.rdb / $(SOLARBINDIR)/udkapi.rdb
 # now do the registration
 	+$(REGCOMP_ENV) && \
-		regcomp -br $(BIN)$/regcomp.rdb 			\
+		$(REGCOMP) -br $(BIN)$/regcomp.rdb 			\
 			-register					\
 			-r $(BIN)$/setup_services.tmp 		\
 			-l com.sun.star.loader.Java2			\
@@ -402,4 +410,4 @@
 		$(foreach,i,$(REGISTERLIBS) $(MY_DLLDIR)$/$(i))
 	-$(MKDIRHIER) $(BIN)/remote
 	-rm -f $@
-	regcomp -register -r $@ -c "$(strip $(REGISTERLIBS))"
+	$(REGCOMP) -register -r $@ -c "$(strip $(REGISTERLIBS))"