Change MOZILLA_HOME to MOZILLA_FIVE_HOME so that we dont fight Communicator

4.x installations.

config/rules.mk

@@ -377,13 +377,13 @@ checkout:
 
 run_viewer: $(DIST)/bin/viewer
 	cd $(DIST)/bin; \
-	MOZILLA_HOME= ; \
+	MOZILLA_FIVE_HOME= ; \
 	LD_LIBRARY_PATH=".:$(LIBS_PATH):$$LD_LIBRARY_PATH" \
 	viewer
 
 run_apprunner: $(DIST)/bin/apprunner
 	cd $(DIST)/bin; \
-	MOZILLA_HOME= ; \
+	MOZILLA_FIVE_HOME= ; \
 	LD_LIBRARY_PATH=".:$(LIBS_PATH):$$LD_LIBRARY_PATH" \
 	apprunner
 

js/jsdj/ifcui/run/readme.txt

@@ -49,24 +49,24 @@
  * For UNIX users: Before installing Netscape JavaScript Debugger, you
    must set the following environment variables and restart Communicator:
 
-   MOZILLA_HOME
+   MOZILLA_FIVE_HOME
    Set to the directory in which Communicator is installed. (You may
    have done this when installing Communicator.)  If you installed
    Communicator in /communicator_installation_directory, you could use
    a call such as:
 
-      setenv  MOZILLA_HOME /communicator_installation_directory
+      setenv  MOZILLA_FIVE_HOME /communicator_installation_directory
 
    LD_LIBRARY_PATH
-   Add MOZILLA_HOME to this path. If you already have this variable
-   set, you can add MOZILLA_HOME with a call such as the following:
+   Add MOZILLA_FIVE_HOME to this path. If you already have this variable
+   set, you can add MOZILLA_FIVE_HOME with a call such as the following:
 
-      setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${MOZILLA_HOME}
+      setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${MOZILLA_FIVE_HOME}
 
    If you do not already have this variable set, you can set it with a
    call such as the following:
 
-      setenv LD_LIBRARY_PATH ${MOZILLA_HOME}
+      setenv LD_LIBRARY_PATH ${MOZILLA_FIVE_HOME}
 
  * IMPORTANT NOTE to Visual JavaScript PR1 users: Due to a CLASSPATH
    conflict, you must uninstall Visual JavaScript PR1 *before*

lib/xp/xp_file.c

@@ -1123,7 +1123,7 @@ xp_FileName (const char *name, XP_FileType type, char* buf, char* configBuf)
      {
          extern void fe_GetProgramDirectory(char *path, int len);
          char *policyFN = "moz40p3";
-         char *mozHome  = getenv("MOZILLA_HOME");
+         char *mozHome  = getenv("MOZILLA_FIVE_HOME");
          char *lang     = getenv("LANG");
          char  dirName[1024];
 

modules/libpref/src/prefapi.c

@@ -2480,9 +2480,9 @@ pref_LoadAutoAdminLib()
 		}
 		else
 		{
-			if (getenv("MOZILLA_HOME"))
+			if (getenv("MOZILLA_FIVE_HOME"))
 			{
-				PL_strcpy(aalib, getenv("MOZILLA_HOME"));
+				PL_strcpy(aalib, getenv("MOZILLA_FIVE_HOME"));
 				lib = PR_LoadLibrary(PL_strcat(aalib, ADMNLIBNAME));
 			}
 			if (lib == NULL)

modules/libpref/src/prefapi.cpp

@@ -2480,9 +2480,9 @@ pref_LoadAutoAdminLib()
 		}
 		else
 		{
-			if (getenv("MOZILLA_HOME"))
+			if (getenv("MOZILLA_FIVE_HOME"))
 			{
-				PL_strcpy(aalib, getenv("MOZILLA_HOME"));
+				PL_strcpy(aalib, getenv("MOZILLA_FIVE_HOME"));
 				lib = PR_LoadLibrary(PL_strcat(aalib, ADMNLIBNAME));
 			}
 			if (lib == NULL)

modules/softupdt/src/su_unix.c

@@ -44,7 +44,7 @@ char * FE_GetDirectoryPath( su_DirSpecID folderID)
 		{
 			if ( getenv (UNIX_GLOBAL_FLAG) )
 			{	
-				if (directory = getenv("MOZILLA_HOME"))
+				if (directory = getenv("MOZILLA_FIVE_HOME"))
 				{
     					PR_snprintf( Path, MAXPATHLEN, "%s/", directory);
 				}
@@ -68,7 +68,7 @@ char * FE_GetDirectoryPath( su_DirSpecID folderID)
 		break;
 
 		case eCommunicatorFolder:
-		if (directory = getenv("MOZILLA_HOME"))
+		if (directory = getenv("MOZILLA_FIVE_HOME"))
 		{
     			PR_snprintf( Path, MAXPATHLEN, "%s/", directory );
 			directory = XP_STRDUP( Path );
@@ -98,7 +98,7 @@ char * FE_GetDirectoryPath( su_DirSpecID folderID)
 		break;
 
 		case eJavaBinFolder:
-		if (directory = getenv("MOZILLA_HOME"))
+		if (directory = getenv("MOZILLA_FIVE_HOME"))
 		{
     			PR_snprintf( Path, MAXPATHLEN, "%s/", directory);
 		}
@@ -109,7 +109,7 @@ char * FE_GetDirectoryPath( su_DirSpecID folderID)
 		break;
 
 		case eJavaClassesFolder:
-		if (directory = getenv("MOZILLA_HOME"))
+		if (directory = getenv("MOZILLA_FIVE_HOME"))
 		{
     			PR_snprintf( Path, MAXPATHLEN, "%s/", directory);
 		}
@@ -123,7 +123,7 @@ char * FE_GetDirectoryPath( su_DirSpecID folderID)
 		{
 			if ( getenv (UNIX_GLOBAL_FLAG) )
 			{	
-				if (directory = getenv("MOZILLA_HOME"))
+				if (directory = getenv("MOZILLA_FIVE_HOME"))
 				{
     					PR_snprintf( Path, MAXPATHLEN, "%s/", directory);
 				}

network/module/nsNetService.cpp

@@ -1466,7 +1466,7 @@ char *mangleResourceIntoFileURL(const char* aResourceFileName)
 //
 // Obtain the resource: url base from the environment variable
 //
-// MOZILLA_HOME
+// MOZILLA_FIVE_HOME
 //
 // Which is the standard place where mozilla stores global (ie, not
 // user specific) data
@@ -1476,13 +1476,13 @@ char *mangleResourceIntoFileURL(const char* aResourceFileName)
 #define MAXPATHLEN 1024 // A good guess, i suppose
 #endif
 
-#define MOZILLA_HOME "MOZILLA_HOME"
+#define MOZILLA_FIVE_HOME "MOZILLA_FIVE_HOME"
 
     static char * nsUnixMozillaHomePath = nsnull;
 
     if (nsnull == nsUnixMozillaHomePath)
     {
-      nsUnixMozillaHomePath = PR_GetEnv(MOZILLA_HOME);
+      nsUnixMozillaHomePath = PR_GetEnv(MOZILLA_FIVE_HOME);
     }
     if (nsnull == nsUnixMozillaHomePath)
     {

silentdl/nsSilentDownload.cpp

@@ -203,7 +203,7 @@ CreateOutFileLocation(char* url, char* directory)
     } 
     else 
     {
-        directory = getenv("MOZILLA_HOME");
+        directory = getenv("MOZILLA_FIVE_HOME");
         if (directory) 
         {
            PR_snprintf( Path, MAXPATHLEN, "%s/", directory);