Index: xpcom/glue/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/xpcom/glue/Makefile.in,v retrieving revision 1.56 diff -p -u -B -U 10 -r1.56 Makefile.in --- xpcom/glue/Makefile.in 18 Sep 2007 18:14:35 -0000 1.56 +++ xpcom/glue/Makefile.in 20 Sep 2007 19:40:50 -0000 @@ -31,20 +31,21 @@ # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ +sysconfdir = @sysconfdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(srcdir)/objs.mk EXTRA_DEPS += $(srcdir)/objs.mk DIRS = standalone MODULE = xpcom @@ -129,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 20 Sep 2007 19:40:50 -0000 @@ -32,20 +32,21 @@ # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ +sysconfdir = @sysconfdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(srcdir)/../glue/objs.mk EXTRA_DEPS += $(srcdir)/../glue/objs.mk MODULE = xpcom LIBRARY_NAME = xpcom_core @@ -151,20 +152,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 20 Sep 2007 19:40:50 -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 20 Sep 2007 19:40:50 -0000 @@ -33,20 +33,21 @@ # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ +sysconfdir = @sysconfdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk NO_PKG_FILES = \ xulrunner-config \ regchrome* \ regxpcom* \ xpcshell* \ $(NULL) @@ -66,21 +67,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 20 Sep 2007 19:40:50 -0000 @@ -31,20 +31,21 @@ # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ +sysconfdir = @sysconfdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(srcdir)/../objs.mk EXTRA_DEPS += $(srcdir)/../objs.mk MODULE = xpcom LIBRARY_NAME = xpcomglue DIST_INSTALL = 1 @@ -104,20 +105,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