diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2005-03-11 21:33:05 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2005-03-11 21:33:05 +0000 |
| commit | 44bc78939bed4a55db2bab87d9ed817a79d1260b (patch) | |
| tree | 4939464259a55e8dfd9356629ef7a9ad67842179 /components.mk | |
| parent | 385a06685da620c0753ef6daf187f4eb2d5f7517 (diff) | |
| download | ds-44bc78939bed4a55db2bab87d9ed817a79d1260b.tar.gz ds-44bc78939bed4a55db2bab87d9ed817a79d1260b.tar.xz ds-44bc78939bed4a55db2bab87d9ed817a79d1260b.zip | |
Use new RHEL platform naming
Diffstat (limited to 'components.mk')
| -rw-r--r-- | components.mk | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/components.mk b/components.mk index c0ebfbef..807ffb5c 100644 --- a/components.mk +++ b/components.mk @@ -189,11 +189,7 @@ NSPR_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/nspr NSPR_ABS_BUILD_DIR = $(NSCP_ABS_DISTDIR_FULL_RTL)/nspr NSPR_LIBPATH = $(NSPR_BUILD_DIR)/lib NSPR_INCLUDE = -I$(NSPR_BUILD_DIR)/include -ifeq ($(ARCH), Linux) -NSPR_IMPORT = $(COMPONENTS_DIR)/nspr20/$(NSPR_RELDATE)/RHEL3/$(FULL_RTL_OBJDIR) -else NSPR_IMPORT = $(COMPONENTS_DIR)/nspr20/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR) -endif NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/lib,$(NSPR_LIBNAMES))) LIBS_TO_PKG += $(NSPR_LIBS_TO_PKG) @@ -235,11 +231,7 @@ DBM_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/dbm DBM_LIBPATH = $(DBM_BUILD_DIR)/lib DBM_INCDIR = $(DBM_BUILD_DIR)/include DBM_DEP = $(DBM_LIBPATH)/libdbm.$(LIB_SUFFIX) -ifeq ($(ARCH), Linux) -DBM_IMPORT = $(COMPONENTS_DIR)/dbm/$(DBM_RELDATE)/RHEL3/$(NSOBJDIR_NAME) -else DBM_IMPORT = $(COMPONENTS_DIR)/dbm/$(DBM_RELDATE)/$(NSOBJDIR_NAME) -endif DBM_INCLUDE = -I$(DBM_INCDIR) DBM_LIBNAMES = dbm @@ -288,11 +280,7 @@ else SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign endif SECURITY_LIBNAMES = ssl3 nss3 softokn3 -ifeq ($(ARCH), Linux) -SECURITY_IMPORT = $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE)/RHEL3/$(FULL_RTL_OBJDIR) -else SECURITY_IMPORT = $(COMPONENTS_DIR)/nss/$(SECURITY_RELDATE)/$(FULL_RTL_OBJDIR) -endif SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) SECURITY_LIBNAMES.pkg += smime3 |