       gDirServiceProvider->SetProfileDir(profileDir);  
       mCurrentProfileName.Assign(aCurrentProfile);    
       gProfileDataAccess->SetCurrentProfile(aCurrentProfile);
-*** misc/mozilla/security/coreconf/command.mk	2002-02-15 23:53:12.000000000 +0100
---- misc/build/mozilla/security/coreconf/command.mk	2005-07-13 17:26:54.000000000 +0200
+*** misc/mozilla/security/coreconf/Linux.mk	Tue Feb 10 21:33:51 2004
+--- misc/build/mozilla/security/coreconf/Linux.mk	Tue Jan 10 17:55:24 2006
+***************
+*** 123,129 ****
+  
+  ifeq ($(OS_RELEASE),2.0)
+  	OS_REL_CFLAGS	+= -DLINUX2_0
+! 	MKSHLIB		= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  	ifdef BUILD_OPT
+  		OPTIMIZER	= -O2
+  	endif
+--- 123,129 ----
+  
+  ifeq ($(OS_RELEASE),2.0)
+  	OS_REL_CFLAGS	+= -DLINUX2_0
+! 	MKSHLIB		= $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  	ifdef BUILD_OPT
+  		OPTIMIZER	= -O2
+  	endif
+***************
+*** 149,154 ****
+--- 149,155 ----
+  
+  DSO_CFLAGS		= -fPIC
+  DSO_LDOPTS		= -shared
++ DSO_LDOPTS		+= -Wl,-rpath,\$$ORIGIN
+  DSO_LDFLAGS		=
+  
+  # INCLUDES += -I/usr/include -Y/usr/include/linux
+*** misc/mozilla/security/coreconf/Linux2.1.mk	Wed Nov  7 15:58:09 2001
+--- misc/build/mozilla/security/coreconf/Linux2.1.mk	Tue Jan 10 17:55:24 2006
+***************
+*** 36,42 ****
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  ifeq ($(OS_RELEASE),2.1)
+          OS_REL_CFLAGS   += -DLINUX2_1
+!         MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+          ifdef BUILD_OPT
+                  OPTIMIZER       = -O2
+          endif
+--- 36,42 ----
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  ifeq ($(OS_RELEASE),2.1)
+          OS_REL_CFLAGS   += -DLINUX2_1
+!         MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+          ifdef BUILD_OPT
+                  OPTIMIZER       = -O2
+          endif
+*** misc/mozilla/security/coreconf/Linux2.2.mk	Wed Nov  7 15:56:18 2001
+--- misc/build/mozilla/security/coreconf/Linux2.2.mk	Tue Jan 10 17:55:24 2006
+***************
+*** 36,42 ****
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  
+  OS_REL_CFLAGS   += -DLINUX2_1
+! MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  ifdef BUILD_OPT
+              OPTIMIZER       = -O2
+  endif
+--- 36,42 ----
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  
+  OS_REL_CFLAGS   += -DLINUX2_1
+! MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  ifdef BUILD_OPT
+              OPTIMIZER       = -O2
+  endif
+*** misc/mozilla/security/coreconf/Linux2.4.mk	Wed Nov  7 15:56:18 2001
+--- misc/build/mozilla/security/coreconf/Linux2.4.mk	Tue Jan 10 17:55:24 2006
+***************
+*** 36,42 ****
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  
+  OS_REL_CFLAGS   += -DLINUX2_1
+! MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  ifdef BUILD_OPT
+              OPTIMIZER       = -O2
+  endif
+--- 36,42 ----
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  
+  OS_REL_CFLAGS   += -DLINUX2_1
+! MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  ifdef BUILD_OPT
+              OPTIMIZER       = -O2
+  endif
+*** misc/mozilla/security/coreconf/Linux2.5.mk	Sat Jan 26 19:45:37 2002
+--- misc/build/mozilla/security/coreconf/Linux2.5.mk	Tue Jan 10 17:55:24 2006
+***************
+*** 36,42 ****
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  
+  OS_REL_CFLAGS   += -DLINUX2_1
+! MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  ifdef BUILD_OPT
+              OPTIMIZER       = -O2
+  endif
+--- 36,42 ----
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  
+  OS_REL_CFLAGS   += -DLINUX2_1
+! MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  ifdef BUILD_OPT
+              OPTIMIZER       = -O2
+  endif
+*** misc/mozilla/security/coreconf/Linux2.6.mk	Sat Jul 19 17:21:50 2003
+--- misc/build/mozilla/security/coreconf/Linux2.6.mk	Tue Jan 10 17:55:24 2006
+***************
+*** 36,42 ****
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  
+  OS_REL_CFLAGS   += -DLINUX2_1
+! MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  ifdef BUILD_OPT
+              OPTIMIZER       = -O2
+  endif
+--- 36,42 ----
+  include $(CORE_DEPTH)/coreconf/Linux.mk
+  
+  OS_REL_CFLAGS   += -DLINUX2_1
+! MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+  ifdef BUILD_OPT
+              OPTIMIZER       = -O2
+  endif
+*** misc/mozilla/security/coreconf/SunOS5.mk	Fri Oct 15 19:52:29 2004
+--- misc/build/mozilla/security/coreconf/SunOS5.mk	Tue Jan 10 17:55:24 2006
+***************
+*** 164,175 ****
+--- 164,177 ----
+  
+  # ld options:
+  # -G: produce a shared object
++ # -R '$ORIGIN': search for dependencies in same directory
+  # -z defs: no unresolved symbols allowed
+  ifdef NS_USE_GCC
+  ifeq ($(USE_64), 1)
+  	DSO_LDOPTS += -m64
+  endif
+  	DSO_LDOPTS += -shared -h $(notdir $@)
++     DSO_LDOPTS += -Wl,-rpath,\$$ORIGIN
+  else
+  ifeq ($(USE_64), 1)
+  	ifeq ($(OS_TEST),i86pc)
+***************
+*** 179,184 ****
+--- 181,187 ----
+  	endif
+  endif
+  	DSO_LDOPTS += -G -h $(notdir $@)
++     DSO_LDOPTS += -R '\$$ORIGIN'
+  endif
+  
+  # -KPIC generates position independent code for use in shared libraries.
+*** misc/mozilla/security/coreconf/command.mk	Fri Feb 15 17:53:12 2002
+--- misc/build/mozilla/security/coreconf/command.mk	Tue Jan 10 17:55:24 2006
 ***************
 *** 42,48 ****
   LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)

      if test -n "$GNU_CC"; then
          DSO_CFLAGS=-fPIC
      else
*** misc/mozilla/directory/c-sdk/configure.in	2004-09-14 23:14:38.000000000 +0200
--- misc/build/mozilla/directory/c-sdk/configure.in	2005-07-13 17:26:54.000000000 +0200
***************
*** 1144,1149 ****
--- 1144,1150 ----

  private:
      nsAbWinHelper *mHelper ;
  } ;
*** misc/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp	Wed Dec 24 12:18:08 2003
--- misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp	Tue Jan 10 17:55:24 2006
***************
*** 97,102 ****
--- 97,105 ----
