diff --git a/mozilla/modules/libreg/Makefile.in b/mozilla/modules/libreg/Makefile.in
index fcc0da54660..9a278a6b814 100644
--- a/mozilla/modules/libreg/Makefile.in
+++ b/mozilla/modules/libreg/Makefile.in
@@ -26,11 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= include src
-
-ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
-DIRS		+= standalone
-endif
+DIRS		= include src standalone
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/modules/libreg/standalone/Makefile.in b/mozilla/modules/libreg/standalone/Makefile.in
index 2e24617cc7c..11beb974d77 100644
--- a/mozilla/modules/libreg/standalone/Makefile.in
+++ b/mozilla/modules/libreg/standalone/Makefile.in
@@ -23,7 +23,7 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
-VPATH		= @srcdir@:@srcdir@/../src/
+VPATH		= @srcdir@/../src/
 
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../src/objs.mk