Bugzilla Bug 327544: set OBJDIR to $(OBJDIR_NAME) to ensure that OBJDIR
authorwtchang%redhat.com
Mon, 20 Feb 2006 19:20:13 +0000
changeset 3590 6feaad6ee12c060e4a42a183e600cc9cb168f5d8
parent 3589 859e54f66a6d991bdc376249481357afcc2aa14b
child 3593 c68a6d066ff623c4ab0e7c0d57461e43890bf596
push idunknown
push userunknown
push dateunknown
bugs327544
Bugzilla Bug 327544: set OBJDIR to $(OBJDIR_NAME) to ensure that OBJDIR and OBJDIR_NAME have the same value even if OBJDIR_NAME is overriden. r=cls.
configure
configure.in
--- a/configure
+++ b/configure
@@ -698,17 +698,17 @@ USE_64=
 USE_CPLUS=
 USE_IPV6=
 USE_MDUPDATE=
 _MACOSX_DEPLOYMENT_TARGET=
 _OPTIMIZE_FLAGS=-O
 _DEBUG_FLAGS=-g
 MOZ_DEBUG=1
 MOZ_OPTIMIZE=
-OBJDIR=.
+OBJDIR='$(OBJDIR_NAME)'
 OBJDIR_NAME=.
 OBJDIR_SUFFIX=OBJ
 NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
 NOSUCHFILE=/no-such-file
 LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
 LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
 CYGWIN_WRAPPER=
 MACOS_SDK_DIR=
--- a/configure.in
+++ b/configure.in
@@ -57,17 +57,17 @@ USE_64=
 USE_CPLUS=
 USE_IPV6=
 USE_MDUPDATE=
 _MACOSX_DEPLOYMENT_TARGET=
 _OPTIMIZE_FLAGS=-O
 _DEBUG_FLAGS=-g
 MOZ_DEBUG=1
 MOZ_OPTIMIZE=
-OBJDIR=.
+OBJDIR='$(OBJDIR_NAME)'
 OBJDIR_NAME=.
 OBJDIR_SUFFIX=OBJ
 NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
 NOSUCHFILE=/no-such-file
 LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
 LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
 CYGWIN_WRAPPER=
 MACOS_SDK_DIR=