[Fedora-directory-commits] ldapserver buildpaths.mk,1.11,1.12
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri Feb 17 15:05:57 UTC 2006
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2521
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/ldapserver/buildpaths.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- buildpaths.mk 15 Feb 2006 22:53:45 -0000 1.11
+++ buildpaths.mk 17 Feb 2006 15:05:32 -0000 1.12
@@ -67,17 +67,23 @@
MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
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
More information about the Fedora-directory-commits
mailing list