[Fedora-directory-commits] setuputil buildpaths.mk,1.2,1.3

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2461

Modified Files:
	buildpaths.mk 
Log Message:
1) Fix moz objdir name for generic linux x86_64
2) Allow moz objdir name to be passed in



Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/buildpaths.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildpaths.mk	15 Feb 2006 22:51:00 -0000	1.2
+++ buildpaths.mk	17 Feb 2006 15:03:36 -0000	1.3
@@ -54,17 +54,23 @@
   MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
 endif
 ifdef MOZILLA_SOURCE_ROOT
-  # some of the mozilla components are put in a platform/buildtype specific
-  # subdir of mozilla/dist, and their naming convention is different than
-  # ours - we need to map ours to theirs
-  ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
-    MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
-  else
-  ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
-    MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
-  else
-    MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
-  endif
+  ifndef MOZ_OBJDIR_NAME
+    # some of the mozilla components are put in a platform/buildtype specific
+    # subdir of mozilla/dist, and their naming convention is different than
+    # ours - we need to map ours to theirs
+    ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
+      MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+    else
+    ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
+      MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+    else
+    ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
+      MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
+    else
+      MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
+    endif
+    endif
+    endif
   endif
 endif