From 3d45df344602687c8983f5fb609721aa8ca2469f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 18 Jan 2011 15:32:55 +0100 Subject: rework PKG_FLAVOURS. Subpackages can have flavours, so always add PKG_NAME to PKG_FLAVOURS variable. ala PKG_FLAVOURS_LIBNCURSES. Bug reported by Phil Sutter. --- package/net-snmp/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'package/net-snmp/Makefile') diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 859e8a658..d32401d33 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -22,7 +22,7 @@ PKGSD_LIBNETSNMP:= SNMP library PKGSS_LIBNETSNMP:= libelf PKGSC_LIBNETSNMP:= libs -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_SNMPD:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -33,7 +33,7 @@ $(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},$ SNMP_TRANSPORTS_INCLUDED:= UDP TCP Callback Unix SNMP_TRANSPORTS_EXCLUDED:= Alias -ifneq (${ADK_PACKAGE_NET_SNMP_WITH_IPV6},) +ifneq (${ADK_PACKAGE_SNMPD_WITH_IPV6},) SNMP_TRANSPORTS_INCLUDED+= TCPIPv6 UDPIPv6 else SNMP_TRANSPORTS_EXCLUDED:= TCPIPv6 UDPIPv6 @@ -61,7 +61,7 @@ CONFIGURE_ARGS+= --with-defaults \ --without-rpm \ --without-zlib -ifneq (${ADK_PACKAGE_NET_SNMP_WITH_IPV6},) +ifneq (${ADK_PACKAGE_SNMPD_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 @@ -69,13 +69,17 @@ endif FAKE_FLAGS+= INSTALL_PREFIX="${WRKINST}" -post-install: +libnetsnmp-install: ${INSTALL_DIR} ${IDIR_LIBNETSNMP}/usr/lib ${CP} ${WRKINST}/usr/lib/libnetsnmp*.so* ${IDIR_LIBNETSNMP}/usr/lib/ + +snmpd-install: ${INSTALL_DIR} ${IDIR_SNMPD}/etc/snmp ${INSTALL_DIR} ${IDIR_SNMPD}/usr/sbin ${INSTALL_DATA} ./files/snmpd.conf ${IDIR_SNMPD}/etc/snmp/snmpd.conf ${INSTALL_BIN} ${WRKINST}/usr/sbin/snmpd ${IDIR_SNMPD}/usr/sbin/snmpd + +snmp-utils-install: ${INSTALL_DIR} ${IDIR_SNMP_UTILS}/usr/bin ${CP} ${WRKINST}/usr/bin/snmp{get,set,status,test,trap,walk} \ ${IDIR_SNMP_UTILS}/usr/bin/ -- cgit v1.2.3