diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/net-snmp | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/net-snmp')
| -rw-r--r-- | package/net-snmp/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 2bb6b927a..309df001a 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= net-snmp PKG_VERSION:= 5.7.2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 7db683faba037249837b226f64d566d4 -PKG_DESCR:= SNMP Agent +PKG_DESCR:= snmp agent PKG_SECTION:= net/misc PKG_DEPENDS:= libnetsnmp libelf libnl PKG_BUILDDEP:= libelf libnl @@ -20,14 +20,14 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= SNMPD SNMP_UTILS LIBNETSNMP -PKGSD_SNMP_UTILS:= SNMP utilities +PKGSD_SNMP_UTILS:= snmp utilities PKGSS_SNMP_UTILS:= libnetsnmp libelf -PKGSD_LIBNETSNMP:= SNMP library +PKGSD_LIBNETSNMP:= snmp library PKGSS_LIBNETSNMP:= libelf -PKGSC_LIBNETSNMP:= libs +PKGSC_LIBNETSNMP:= libs/net PKG_FLAVOURS_SNMPD:= WITH_IPV6 -PKGFD_WITH_IPV6:= enable IPv6 support +PKGFD_WITH_IPV6:= enable ipv6 support ifeq ($(ADK_STATIC),y) PKG_OPTS+= libmix |