r=cls, a=cls

Broken objdir stuff

uriloader/exthandler/Makefile.in

@@ -26,7 +26,7 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-VPATH		= @srcdir@;@srcdir@/os2
+VPATH		= @srcdir@:@srcdir@/os2
 else
 VPATH		= @srcdir@:@srcdir@/unix
 endif
@@ -40,6 +40,12 @@ else
 OSDIR	= unix
 endif
 
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+OSHELPER	= $(OSDIR)/nsOSHelperAppService.cpp
+else
+OSHELPER	= nsOSHelperAppService.cpp
+endif
+
 EXPORTS = 	nsExternalHelperAppService.h \
 		$(OSDIR)/nsOSHelperAppService.h \
 		nsHelperAppRDF.h	    \
@@ -53,7 +59,7 @@ XPIDLSRCS = \
 
 CPPSRCS	= \
 	nsExternalHelperAppService.cpp	\
-	$(OSDIR)/nsOSHelperAppService.cpp	\
+	$(OSHELPER) \
 	$(NULL)