Index: xpcom/glue/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/xpcom/glue/Makefile.in,v retrieving revision 1.57 diff -p -u -B -U 10 -r1.57 Makefile.in --- xpcom/glue/Makefile.in 20 Sep 2007 23:14:25 -0000 1.57 +++ xpcom/glue/Makefile.in 2 Nov 2007 11:59:10 -0000 @@ -130,18 +130,20 @@ SDK_LIBRARY = FORCE_STATIC_LIB = 1 # Force use of PIC FORCE_USE_PIC = 1 # Pretend we're statically linking the CRT, even though we might not be: this # avoids "msvcrp" and assembly dependencies from creeping into the directives # for this library on Windows. USE_STATIC_LIBS = 1 +DEFINES += -DSYSCONFDIR="\"$(sysconfdir)\"" + include $(topsrcdir)/config/rules.mk ifdef _MSC_VER # Don't include directives about which CRT to use OS_COMPILE_CXXFLAGS += -Zl OS_COMPILE_CFLAGS += -Zl DEFINES += -D_USE_ANSI_CPP endif Index: xpcom/build/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v retrieving revision 1.103 diff -p -u -B -U 10 -r1.103 Makefile.in --- xpcom/build/Makefile.in 20 Jun 2007 19:22:01 -0000 1.103 +++ xpcom/build/Makefile.in 2 Nov 2007 11:59:10 -0000 @@ -151,20 +151,22 @@ FORCE_USE_PIC = 1 ifndef MOZ_ENABLE_LIBXUL ifndef MINIMO FORCE_SHARED_LIB = 1 endif endif # UNIX98 iconv support OS_LIBS += $(LIBICONV) +DEFINES += -DSYSCONFDIR="\"$(sysconfdir)\"" + GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) include $(topsrcdir)/config/rules.mk DEFINES += \ -D_IMPL_NS_COM \ -D_IMPL_NS_STRINGAPI \ -DEXPORT_XPT_API \ -DEXPORT_XPTC_API Index: xpcom/build/nsXPCOMPrivate.h =================================================================== RCS file: /cvsroot/mozilla/xpcom/build/nsXPCOMPrivate.h,v retrieving revision 1.46 diff -p -u -B -U 10 -r1.46 nsXPCOMPrivate.h --- xpcom/build/nsXPCOMPrivate.h 18 Aug 2007 03:48:16 -0000 1.46 +++ xpcom/build/nsXPCOMPrivate.h 2 Nov 2007 11:59:10 -0000 @@ -238,22 +238,22 @@ NS_GetFrozenFunctions(XPCOMFunctions *en #ifdef XP_MACOSX #define XPCOM_SEARCH_KEY "DYLD_LIBRARY_PATH" #define GRE_FRAMEWORK_NAME "XUL.framework" #define XUL_DLL "XUL" #else #define XPCOM_SEARCH_KEY "LD_LIBRARY_PATH" #define XUL_DLL "libxul"MOZ_DLL_SUFFIX #endif #define GRE_CONF_NAME ".gre.config" -#define GRE_CONF_PATH "/etc/gre.conf" -#define GRE_CONF_DIR "/etc/gre.d" +#define GRE_CONF_PATH SYSCONFDIR "/gre.conf" +#define GRE_CONF_DIR SYSCONFDIR "/gre.d" #define GRE_USER_CONF_DIR ".gre.d" #endif #if defined(XP_WIN) || defined(XP_OS2) #define XPCOM_FILE_PATH_SEPARATOR "\\" #define XPCOM_ENV_PATH_SEPARATOR ";" #elif defined(XP_UNIX) || defined(XP_BEOS) #define XPCOM_FILE_PATH_SEPARATOR "/" #define XPCOM_ENV_PATH_SEPARATOR ":" #else Index: xulrunner/installer/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/xulrunner/installer/Makefile.in,v retrieving revision 1.10 diff -p -u -B -U 10 -r1.10 Makefile.in --- xulrunner/installer/Makefile.in 10 Aug 2007 12:56:59 -0000 1.10 +++ xulrunner/installer/Makefile.in 2 Nov 2007 11:59:10 -0000 @@ -66,21 +66,21 @@ include $(topsrcdir)/config/rules.mk INSTALL_SDK = 1 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk $(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile printf "[%s]\nGRE_PATH=%s\nxulrunner=true" $(MOZILLA_VERSION) $(installdir)> $@ ifndef SKIP_GRE_REGISTRATION # to register xulrunner per-user, override this with $HOME/.gre.d -regdir = /etc/gre.d +regdir = $(sysconfdir)/gre.d install:: $(MOZILLA_VERSION).system.conf $(NSINSTALL) -D $(DESTDIR)$(regdir) $(SYSINSTALL) $^ $(DESTDIR)$(regdir) endif # Add pkg-config files to the install:: target pkg_config_files = \ libxul.pc \ Index: xpcom/glue/standalone/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/xpcom/glue/standalone/Makefile.in,v retrieving revision 1.38 diff -p -u -B -U 10 -r1.38 Makefile.in --- xpcom/glue/standalone/Makefile.in 11 Jul 2007 17:26:12 -0000 1.38 +++ xpcom/glue/standalone/Makefile.in 2 Nov 2007 11:59:10 -0000 @@ -104,20 +104,22 @@ FORCE_USE_PIC = 1 # Pretend we're statically linking the CRT, even though we might not be: this # avoids "msvcrp" and assembly dependencies from creeping into the directives # for this library on Windows. USE_STATIC_LIBS = 1 GARBAGE += $(XPCOM_GLUE_SRC_LCSRCS) $(XPCOM_GLUE_SRC_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) SRCS_IN_OBJDIR = 1 +DEFINES += -DSYSCONFDIR="\"$(sysconfdir)\"" + include $(topsrcdir)/config/rules.mk ifdef _MSC_VER # Don't include directives about which CRT to use OS_COMPILE_CXXFLAGS += -Zl OS_COMPILE_CFLAGS += -Zl DEFINES += -D_USE_ANSI_CPP endif export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) $(topsrcdir)/xpcom/glue/nsStringAPI.cpp Index: xulrunner/app/nsRegisterGREUnix.cpp =================================================================== RCS file: /cvsroot/mozilla/xulrunner/app/nsRegisterGREUnix.cpp,v retrieving revision 1.4 diff -p -u -B -U 10 -r1.4 nsRegisterGREUnix.cpp --- xulrunner/app/nsRegisterGREUnix.cpp 2 Jul 2007 18:20:28 -0000 1.4 +++ xulrunner/app/nsRegisterGREUnix.cpp 2 Nov 2007 11:59:10 -0000 @@ -123,21 +123,21 @@ MakeConfFile(const char *regfile, const PRBool RegisterXULRunner(PRBool aRegisterGlobally, nsIFile* aLocation, const GREProperty *aProperties, PRUint32 aPropertiesLen, const char *aGREMilestone) { // Register ourself in /etc/gre.d or ~/.gre.d/ and record what key we created // for future unregistration. nsresult rv; - char root[MAXPATHLEN] = "/etc/gre.d"; + char root[MAXPATHLEN] = SYSCONFDIR "/gre.d"; if (!aRegisterGlobally) { char *home = PR_GetEnv("HOME"); if (!home || !*home) return PR_FALSE; PR_snprintf(root, MAXPATHLEN, "%s/.gre.d", home); } nsCString greHome; @@ -215,21 +215,21 @@ RegisterXULRunner(PRBool aRegisterGlobal return PR_FALSE; } void UnregisterXULRunner(PRBool aRegisterGlobally, nsIFile* aLocation, const char *aGREMilestone) { nsresult rv; - char root[MAXPATHLEN] = "/etc/gre.d"; + char root[MAXPATHLEN] = SYSCONFDIR "/gre.d"; if (!aRegisterGlobally) { char *home = PR_GetEnv("HOME"); if (!home || !*home) return; PR_snprintf(root, MAXPATHLEN, "%s/.gre.d", home); } nsCOMPtr savedInfoFile; Index: xulrunner/app/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/xulrunner/app/Makefile.in,v retrieving revision 1.31 diff -p -u -B -U 10 -r1.31 Makefile.in --- xulrunner/app/Makefile.in 24 Jun 2006 13:12:43 -0000 1.31 +++ xulrunner/app/Makefile.in 2 Nov 2007 11:59:10 -0000 @@ -122,20 +122,22 @@ endif ifndef MOZ_WINCONSOLE ifdef MOZ_DEBUG MOZ_WINCONSOLE = 1 else MOZ_WINCONSOLE = 0 endif endif DEFINES += -DMOZ_WINCONSOLE=$(MOZ_WINCONSOLE) +DEFINES += -DSYSCONFDIR="\"$(sysconfdir)\"" + NSDISTMODE = copy include $(topsrcdir)/config/config.mk ifdef NS_TRACE_MALLOC EXTRA_DSO_LIBS += tracemalloc endif ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool) Index: config/autoconf.mk.in =================================================================== RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v retrieving revision 3.440 diff -p -u -B -U 10 -r3.440 autoconf.mk.in --- config/autoconf.mk.in 11 Oct 2007 18:50:54 -0000 3.440 +++ config/autoconf.mk.in 2 Nov 2007 11:59:10 -0000 @@ -55,20 +55,21 @@ MOZ_APP_VERSION = @MOZ_APP_VERSION@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ +sysconfdir = @sysconfdir@ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ ifdef LIBXUL_SDK LIBXUL_DIST = $(LIBXUL_SDK)