diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
| commit | 98b7adfbd06f0f6bd99ca4805ca34250ee027fa1 (patch) | |
| tree | a68345ba8ba7ee532e4b7426cadad31d7add24c0 /package/curl/Makefile | |
| parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
| parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/curl/Makefile')
| -rw-r--r-- | package/curl/Makefile | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile index 146a476b4..75fab01fa 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -13,13 +13,13 @@ PKG_DEPENDS:= libcurl PKG_BUILDDEP:= zlib PKG_URL:= http://curl.haxx.se/ PKG_SITES:= http://curl.haxx.se/download/ +PKG_LIBNAME:= libcurl +PKG_OPTS:= dev -PKG_SUBPKGS:= CURL LIBCURL LIBCURL_DEV +PKG_SUBPKGS:= CURL LIBCURL PKGSD_LIBCURL:= a client-side URL transfer library PKGSC_LIBCURL:= libs PKGSS_LIBCURL:= zlib -PKGSD_LIBCURL_DEV:= development files for libcurl -PKGSC_LIBCURL_DEV:= devel PKG_FLAVOURS_CURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support @@ -36,8 +36,7 @@ PKGCB_WITH_GNUTLS:= gnutls include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL})) -$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV})) +$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL},${PKG_OPTS})) ifeq (${ADK_PACKAGE_LIBCURL_WITHOUT_SSL},y) CONFIGURE_ARGS+= --without-ssl \ @@ -90,14 +89,4 @@ libcurl-install: ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib -libcurl-dev-install: - ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcurl.a ${IDIR_LIBCURL_DEV}/usr/lib - ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl - ${CP} ${WRKINST}/usr/include/curl/*.h \ - ${IDIR_LIBCURL_DEV}/usr/include/curl - ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/curl-config \ - ${IDIR_LIBCURL_DEV}/usr/bin - include ${TOPDIR}/mk/pkg-bottom.mk |