summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2006-02-20 19:25:19 +0000
committerwtchang%redhat.com <devnull@localhost>2006-02-20 19:25:19 +0000
commit285dc32ecc68f6424e994feff0e24e82513d137a (patch)
tree3a4c95a30e5425fcacb0bd0ec36148f66e0f1953
parent8fde0e14ae65525ca6d969fdc52c6e5aff9e980a (diff)
downloadnspr-hg-285dc32ecc68f6424e994feff0e24e82513d137a.tar.gz
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. Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
-rwxr-xr-xconfigure3
-rw-r--r--configure.in2
2 files changed, 2 insertions, 3 deletions
diff --git a/configure b/configure
index b7da8d25..c968254b 100755
--- a/configure
+++ b/configure
@@ -703,7 +703,7 @@ _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'
@@ -6271,4 +6271,3 @@ chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/configure.in b/configure.in
index 2ef23f2a..fad106bf 100644
--- a/configure.in
+++ b/configure.in
@@ -62,7 +62,7 @@ _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'