diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2006-10-10 20:37:05 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2006-10-10 20:37:05 +0000 |
| commit | 1184a7782ec98e2b6166b2f8bca678b4b5ef50af (patch) | |
| tree | 253bd69bbba505278db25abe0ebe44f268aad144 | |
| parent | e976a91b586186021d84b5135bd4dc9da4e3e31e (diff) | |
Bug(s) fixed: 210220
Bug Description: Update ldapconsole version to 1.0.3; package net-snmp when building from source
Reviewed by: nhosoi, nkinder (Thanks!)
Fix Description: 1) Need to bump version of ldapconsole to 1.0.3 for fds 1.0.3
2) On RHEL3 we still need to build/package net-snmp.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
| -rw-r--r-- | component_versions.mk | 2 | ||||
| -rw-r--r-- | components.mk | 29 |
2 files changed, 19 insertions, 12 deletions
diff --git a/component_versions.mk b/component_versions.mk index 81e969e0..0c0e8c14 100644 --- a/component_versions.mk +++ b/component_versions.mk @@ -156,7 +156,7 @@ ifndef LDAPCONSOLE_GENREL LDAPCONSOLE_GENREL=1.0 endif ifndef LDAPCONSOLE_REL - LDAPCONSOLE_REL=1.0.2 + LDAPCONSOLE_REL=1.0.3 endif ifndef LDAPCONSOLE_COMP LDAPCONSOLE_COMP = directoryconsole diff --git a/components.mk b/components.mk index debb9f0d..860fa088 100644 --- a/components.mk +++ b/components.mk @@ -408,8 +408,15 @@ endif ########################################################### ### Net-SNMP package ###################################### +# given source root overrides other settings +# otherwise, on linux, use +ifdef NETSNMP_SOURCE_ROOT + NETSNMP_LIBPATH = $(NETSNMP_SOURCE_ROOT)/built/lib + NETSNMP_INCDIR = $(NETSNMP_SOURCE_ROOT)/built/include + NETSNMP_BINDIR = $(NETSNMP_SOURCE_ROOT)/built/bin +else ifeq ($(ARCH), Linux) - ifeq ($(USE_64), 1) + ifeq ($(USE_64), 1) NETSNMP_LIBPATH = /usr/lib64 else NETSNMP_LIBPATH = /usr/lib @@ -417,16 +424,11 @@ ifeq ($(ARCH), Linux) NETSNMP_INCDIR = /usr/include/net-snmp NETSNMP_BINDIR = /usr/bin else - ifdef NETSNMP_SOURCE_ROOT - NETSNMP_LIBPATH = $(NETSNMP_SOURCE_ROOT)/built/lib - NETSNMP_INCDIR = $(NETSNMP_SOURCE_ROOT)/built/include - NETSNMP_BINDIR = $(NETSNMP_SOURCE_ROOT)/built/bin - else - NETSNMP_LIBPATH = $(NETSNMP_BUILD_DIR)/lib - NETSNMP_INCDIR = $(NETSNMP_BUILD_DIR)/include - NETSNMP_BINDIR = $(NETSNMP_BUILD_DIR)/bin - endif -endif # Linux + NETSNMP_LIBPATH = $(NETSNMP_BUILD_DIR)/lib + NETSNMP_INCDIR = $(NETSNMP_BUILD_DIR)/include + NETSNMP_BINDIR = $(NETSNMP_BUILD_DIR)/bin +endif +endif NETSNMP_INCLUDE = -I$(NETSNMP_INCDIR) NETSNMP_LIBNAMES = netsnmp netsnmpagent netsnmpmibs netsnmphelpers @@ -439,6 +441,11 @@ ifneq ($(ARCH), WINNT) NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).5, $(addprefix $(LIB_PREFIX), $(NETSNMP_LIBNAMES))) endif LIBS_TO_PKG += $(addprefix $(NETSNMP_LIBPATH)/,$(NETSNMP_SOLIBS)) + else # Linux + ifdef NETSNMP_SOURCE_ROOT + NETSNMP_SOLIBS = $(addsuffix .$(DLL_SUFFIX).5.2.1, $(addprefix $(LIB_PREFIX), $(NETSNMP_LIBNAMES))) + LIBS_TO_PKG += $(addprefix $(NETSNMP_LIBPATH)/,$(NETSNMP_SOLIBS)) + endif # NETSNMP_SOURCE_ROOT endif # Linux endif # WINNT ########################################################### |