From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/axtls/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/axtls/Makefile') diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 11166e6ab..164d79045 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= axtls PKG_VERSION:= 1.4.9 PKG_RELEASE:= 2 PKG_MD5SUM:= 6d519bc3b5f20faa6ef8d423f5062241 -PKG_DESCR:= small embedded webserver with TLS -PKG_SECTION:= www +PKG_DESCR:= small embedded webserver with tls +PKG_SECTION:= net/http PKG_DEPENDS:= libaxtls PKG_URL:= http://axtls.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} @@ -17,7 +17,7 @@ PKG_OPTS:= dev PKG_SUBPKGS:= AXHTTPD LIBAXTLS PKGSD_LIBAXTLS:= small tls library -PKGSC_LIBAXTLS:= libs +PKGSC_LIBAXTLS:= libs/crypto DISTFILES:= axTLS-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/axTLS -- cgit v1.2.3