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/ndisc/Makefile | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/ndisc/Makefile')
| -rw-r--r-- | package/ndisc/Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile index fbd5f4a23..765eab8bc 100644 --- a/package/ndisc/Makefile +++ b/package/ndisc/Makefile @@ -7,22 +7,25 @@ PKG_NAME:= ndisc6 PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 50cb4c19606cf6ff2b7388e71832f579 -PKG_DESCR:= ICMPv6 Neighbour Discovery tools -PKG_SECTION:= ipv6 +PKG_DESCR:= icmpv6 neighbour discovery tools +PKG_SECTION:= net/ipv6 PKG_URL:= http://www.remlab.net/ PKG_SITES:= http://www.remlab.net/files/ndisc6/ PKG_LIBC_DEPENDS:= uclibc glibc PKG_SUBPKGS:= NDISC6 RDISC6 TCPTRACEROUTE6 +PKGSD_NDISC6:= icmpv6 neighbour discovery tool +PKGSD_RDISC6:= icmpv6 router discovery tool +PKGSD_TCPTRACEROUTE6:= lightweight ipv6 tcptraceroute DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_NDISC6},${PKG_SECTION})) +$(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_RDISC6},${PKG_SECTION})) +$(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TCPTRACEROUTE6},${PKG_SECTION})) MAKE_FLAGS+= CC="${TARGET_CC}" |