Index: scp2/source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.214
diff -u -r1.214 file_library_ooo.scp
--- scp2/source/ooo/file_library_ooo.scp	8 Nov 2006 12:02:09 -0000	1.214
+++ scp2/source/ooo/file_library_ooo.scp	7 Dec 2006 22:22:04 -0000
@@ -1335,7 +1335,7 @@
   #endif
 End
 
-#if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
+#if ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
 
 File gid_File_Lib_Mozab_2
     TXT_FILE_BODY;
@@ -1353,7 +1353,7 @@
 
 STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Wpft,wpft)
 
-#if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
+#if ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
 
 File gid_File_Lib_Mozabdrv
     TXT_FILE_BODY;
Index: connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx,v
retrieving revision 1.8
diff -u -r1.8 MNSFolders.cxx
--- connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx	18 Oct 2006 13:10:09 -0000	1.8
+++ connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx	7 Dec 2006 22:22:06 -0000
@@ -93,6 +93,10 @@
         { "Mozilla/", NULL, NULL },
         { "Mozilla/Firefox/", NULL, NULL },
         { "Thunderbird/", "Mozilla/Thunderbird/", NULL }
+    #elif defined(XP_MACOSX)
+	{ "Library/Mozilla/", NULL, NULL },
+	{ "Library/Application Support/Firefox/", NULL, NULL },
+	{ "Library/Thunderbird/", NULL, NULL }
     #else
         { ".mozilla/", NULL, NULL },
         { ".mozilla/firefox/", NULL, NULL },
Index: connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx,v
retrieving revision 1.6
diff -u -r1.6 MNSProfileDiscover.cxx
--- connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx	24 Oct 2006 15:05:50 -0000	1.6
+++ connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx	7 Dec 2006 22:22:09 -0000
@@ -55,12 +55,6 @@
 #include "nsReadableUtils.h"
 
 
-#if defined(XP_MAC) || defined(XP_MACOSX)
-#include <Processes.h>
-#include <CFBundle.h>
-#include "nsILocalFileMac.h"
-#endif
-
 #ifdef XP_UNIX
 #include <unistd.h>
 #include <fcntl.h>
@@ -264,6 +258,10 @@
 
 			nsresult rv;
 			::rtl::OUString regDir = getRegistryDir(product);
+//
+fprintf(stderr,"regDir=%s",regDir);
+fflush(stderr);
+//
             ::rtl::OUString profilesIni( regDir );
             profilesIni += ::rtl::OUString::createFromAscii( "profiles.ini" );
 			IniParser parser( profilesIni );
Index: connectivity/source/drivers/mozab/bootstrap/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- connectivity/source/drivers/mozab/bootstrap/makefile.mk	5 Oct 2006 10:21:33 -0000	1.8
+++ connectivity/source/drivers/mozab/bootstrap/makefile.mk	7 Dec 2006 22:22:10 -0000
@@ -136,12 +136,13 @@
             -Wno-long-long -pthread
 CDEFS     += -DTRACING
 .ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
+INCPOST += $(MOZINC)
 CFLAGS +=   -fPIC
 CFLAGSCXX += \
             -fno-rtti -Wall -Wconversion -Wpointer-arith \
             -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \
             -Wno-long-long
-CDEFS     += -DTRACING
+CDEFS     += -DTRACING -DXP_MACOSX -DMOZILLA_CLIENT
 .ENDIF
 .ENDIF
 
Index: connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h,v
retrieving revision 1.2
diff -u -r1.2 mozilla_profilemanager.h
--- connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h	20 Jun 2006 01:49:58 -0000	1.2
+++ connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h	7 Dec 2006 22:22:10 -0000
@@ -67,11 +67,6 @@
 #include "nsReadableUtils.h"
 
 
-#if defined(XP_MAC) || defined(XP_MACOSX)
-#include <Processes.h>
-#include <CFBundle.h>
-#include "nsILocalFileMac.h"
-#endif
 
 #ifdef XP_UNIX
 #include <unistd.h>