[Fedora-directory-commits] adminutil components.mk, 1.4, 1.5 internal_comp_deps.mk, 1.4, 1.5
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Mon May 22 18:56:19 UTC 2006
Author: nhosoi
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13822
Modified Files:
components.mk internal_comp_deps.mk
Log Message:
[172166] Admin Util build (RPM)
Preparation for the RPM build.
If these environment variables are set, the paths are used instead of the
"local paths" or "internal paths". (note: the values are just examples.)
$ env | egrep "ICU_|NSS_|NSPR_|LDAPCSDK_"
NSS_INCLUDE_DIR=/usr/include/dirsec/nss3
ICU_INCLUDE_DIR=/usr/include
ICU_BIN_DIR=/usr/bin
LDAPCSDK_LIB_DIR=/usr/lib
NSPR_INCLUDE_DIR=/usr/include/dirsec/nspr4
LDAPCSDK_INCLUDE_DIR=/usr/include/mozldap
NSS_LIB_DIR=/usr/lib/dirsec
NSPR_LIB_DIR=/usr/lib/dirsec
ICU_LIB_DIR=/usr/lib
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/components.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- components.mk 1 Mar 2006 23:44:01 -0000 1.4
+++ components.mk 22 May 2006 18:56:16 -0000 1.5
@@ -63,12 +63,23 @@
endif
endif
NSPR_LIBNAMES += nspr4
-ifdef NSPR_SOURCE_ROOT
- NSPR_LIBPATH = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
+ifdef NSPR_INCLUDE_DIR
+ NSPR_INCDIR = $(NSPR_INCLUDE_DIR)
+else
+ ifdef NSPR_SOURCE_ROOT
NSPR_INCDIR = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/include
+ else
+ NSPR_INCDIR = $(NSPR_BUILD_DIR)/include
+ endif
+endif
+ifdef NSPR_LIB_DIR
+ NSPR_LIBPATH = $(NSPR_LIB_DIR)
else
+ ifdef NSPR_SOURCE_ROOT
+ NSPR_LIBPATH = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
+ else
NSPR_LIBPATH = $(NSPR_BUILD_DIR)/lib
- NSPR_INCDIR = $(NSPR_BUILD_DIR)/include
+ endif
endif
NSPR_INCLUDE = -I$(NSPR_INCDIR)
NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/lib,$(NSPR_LIBNAMES)))
@@ -81,24 +92,34 @@
$(addprefix lib, $(NSPR_LIBNAMES))))
else
NSPR_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES)))
- NSPROBJNAME = $(addsuffix .a, $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES))
+ NSPROBJNAME = $(addsuffix .a, $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES)))
LIBNSPR = $(addprefix $(NSPR_LIBPATH)/, $(NSPR_SOLIBS))
NSPRLINK = -L$(NSPR_LIBPATH) $(addprefix -l, $(NSPR_LIBNAMES))
endif
### SECURITY #############################
-ifdef SECURITY_SOURCE_ROOT
- SECURITY_LIBPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
- SECURITY_BINPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/bin
+ifdef NSS_INCLUDE_DIR
+ SECURITY_INCDIR = $(NSS_INCLUDE_DIR)
+else
+ ifdef SECURITY_SOURCE_ROOT
SECURITY_INCDIR = $(SECURITY_SOURCE_ROOT)/dist/public/nss
+ else
+ SECURITY_INCDIR = $(SECURITY_BUILD_DIR)/include
+ endif
+endif
+
+ifdef NSS_LIB_DIR
+ SECURITY_LIBPATH = $(NSS_LIB_DIR)
else
+ ifdef SECURITY_SOURCE_ROOT
+ SECURITY_LIBPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
+ else
SECURITY_LIBPATH = $(SECURITY_BUILD_DIR)/lib
- SECURITY_BINPATH = $(SECURITY_BUILD_DIR)/bin
- SECURITY_INCDIR = $(SECURITY_BUILD_DIR)/include
+ endif
endif
+
SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
# add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS
-SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign
SECURITY_LIBNAMES = ssl3 nss3 softokn3
ifeq ($(ARCH), WINNT)
@@ -117,15 +138,26 @@
# LDAP SDK
###################################################
-ifdef LDAPSDK_SOURCE_ROOT
- LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
+ifdef LDAPCSDK_INCLUDE_DIR
+ LDAPSDK_INCDIR = $(LDAPCSDK_INCLUDE_DIR)
+else
+ ifdef LDAPSDK_SOURCE_ROOT
LDAPSDK_INCDIR = $(LDAPSDK_SOURCE_ROOT)/dist/public/ldap
- LDAPSDK_BINPATH = $(LDAPSDK_SOURCE_ROOT)/dist/bin
+ else
+ LDAPSDK_INCDIR = $(LDAP_ROOT)/include
+ endif
+endif
+
+ifdef LDAPCSDK_LIB_DIR
+ LDAPSDK_LIBPATH = $(LDAPCSDK_LIB_DIR)
else
+ ifdef LDAPSDK_SOURCE_ROOT
+ LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
+ else
LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib
- LDAPSDK_INCDIR = $(LDAP_ROOT)/include
- LDAPSDK_BINPATH = $(LDAP_ROOT)/bin
+ endif
endif
+
LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
# package the include files - needed for the plugin API
@@ -156,20 +188,40 @@
LDAP_LIBPATH = $(LDAPSDK_LIBPATH)
LDAP_INCLUDE = $(LDAPSDK_INCDIR)
-LDAP_TOOLDIR = $(LDAPSDK_BINPATH)
### ICU package ##########################################
ICU_LIB_VERSION = 34
-ifdef ICU_SOURCE_ROOT
- ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
+ifdef ICU_BIN_DIR
+ ICU_BINPATH = $(ICU_BIN_DIR)
+else
+ ifdef ICU_SOURCE_ROOT
ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
+ else
+ ICU_BINPATH = $(ICU_BUILD_DIR)/bin
+ endif
+endif
+
+ifdef ICU_INCLUDE_DIR
+ ICU_INCPATH = $(ICU_INCLUDE_DIR)
+else
+ ifdef ICU_SOURCE_ROOT
ICU_INCPATH = $(ICU_SOURCE_ROOT)/built/include
+ else
+ ICU_INCPATH = $(ICU_BUILD_DIR)/include
+ endif
+endif
+
+ifdef ICU_LIB_DIR
+ ICU_LIBPATH = $(ICU_LIB_DIR)
else
+ ifdef ICU_SOURCE_ROOT
+ ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
+ else
ICU_LIBPATH = $(ICU_BUILD_DIR)/lib
- ICU_BINPATH = $(ICU_BUILD_DIR)/bin
- ICU_INCPATH = $(ICU_BUILD_DIR)/include
+ endif
endif
+
ICU_INCLUDE = -I$(ICU_INCPATH)
ifeq ($(ARCH), WINNT)
ifeq ($(BUILD_DEBUG), optimize)
@@ -183,14 +235,17 @@
else
ICU_LIBNAMES = icui18n icuuc icudata
ICULINK = -L$(ICU_LIBPATH) $(addprefix -l, $(ICU_LIBNAMES))
-#LIBS_TO_PKG = $(addsuffix $(addprefix lib,$(ICU_LIBNAMES))
endif
# Resource Bundle Compiler
ifeq ($(ARCH), WINNT)
ICU_GENRB = $(ICU_BINPATH)/genrb.exe
else
+ ifdef ICU_BIN_DIR
+ ICU_GENRB = genrb
+ else
ICU_GENRB = sh ./genrb_wrapper.sh $(ICU_BUILD_DIR)
+ endif
endif
###########################################################
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/internal_comp_deps.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- internal_comp_deps.mk 1 Mar 2006 23:44:01 -0000 1.4
+++ internal_comp_deps.mk 22 May 2006 18:56:16 -0000 1.5
@@ -68,7 +68,6 @@
$(SECURITY_DEP): $(RELTOOLS) $(NSCP_DISTDIR_FULL_RTL)
ifdef COMPONENT_DEPS
- mkdir -p $(SECURITY_BINPATH)
$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-objdir $(SECURITY_BUILD_DIR) -componentdir $(SECURITY_IMPORT) \
-files $(SECURITY_FILES)
More information about the Fedora-directory-commits
mailing list