[Fedora-directory-commits] dsbuild objdirname.mk,1.2,1.3

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsbuild
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20416/dsbuild

Modified Files:
	objdirname.mk 
Log Message:
use given name for moz objdir naming


Index: objdirname.mk
===================================================================
RCS file: /cvs/dirsec/dsbuild/objdirname.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- objdirname.mk	15 Feb 2006 22:55:40 -0000	1.2
+++ objdirname.mk	16 Feb 2006 21:33:42 -0000	1.3
@@ -134,8 +134,10 @@
 
 ifeq ($(DEBUG), full)
   NSOBJDIR_TAG=_DBG
+  MOZ_OBJDIR_NAME=DBG.OBJ
 else
   NSOBJDIR_TAG=_OPT
+  MOZ_OBJDIR_NAME=OPT.OBJ
 endif
 
 ifeq ($(NSOS_ARCH),WINNT)
@@ -148,14 +150,20 @@
 endif
 
 # Mozilla uses a slightly different naming convention
-ifneq (,$(findstring RHEL3,$(OBJDIR_NAME)))
-  MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME)))
-else
-ifneq (,$(findstring RHEL4,$(OBJDIR_NAME)))
-  MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME)))
-else
-  MOZ_OBJDIR_NAME = $(OBJDIR_NAME)
-endif
+ifndef MOZ_OBJDIR_NAME
+  ifneq (,$(findstring RHEL3,$(OBJDIR_NAME)))
+    MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(OBJDIR_NAME)))
+  else
+  ifneq (,$(findstring RHEL4,$(OBJDIR_NAME)))
+    MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(OBJDIR_NAME)))
+  else
+  ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
+    MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
+  else
+    MOZ_OBJDIR_NAME = $(OBJDIR_NAME)
+  endif
+  endif
+  endif
 endif
 
 # figure out which imports file to use - for console builds