re-enables nsDebug in xpcom glue. 191005 , r=chak, sr=darin, a=dbaron

xpcom/glue/Makefile.in

@@ -40,7 +40,6 @@ LOCAL_INCLUDES	= \
 
 CPPSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS) \
-		nsDebug.cpp              \
 		$(NULL)
 
 SDK_HEADERS     = \

xpcom/glue/objs.mk

@@ -36,6 +36,7 @@
 
 XPCOM_GLUE_SRC_LCSRCS =              \
 		nsCOMPtr.cpp         \
+		nsDebug.cpp          \
 		nsGenericFactory.cpp \
 		nsIInterfaceRequestorUtils.cpp \
 		nsMemory.cpp         \

xpcom/glue/standalone/Makefile.in

@@ -57,7 +57,6 @@ CPPSRCS		= \
 		$(XPCOM_GLUE_SRC_LCSRCS)     \
 		nsXPCOMGlue.cpp              \
 		nsGREDirServiceProvider.cpp  \
-		nsDebugGlue.cpp		     \
 		$(NULL)
 
 SDK_HEADERS     = \

xpcom/glue/standalone/nsGREDirServiceProvider.cpp

@@ -305,8 +305,8 @@ nsGREDirServiceProvider::AddGRELocationToPath()
 
   mPathEnvString = PR_smprintf("%s=%s;%s",
                                XPCOM_SEARCH_KEY,
-                               path,
-                               grePath);
+                               grePath,
+                               path);
   PR_SetEnv(mPathEnvString);
   free(grePath);
 }