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/libgcrypt/Makefile | |
parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libgcrypt/Makefile')
-rw-r--r-- | package/libgcrypt/Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index a5369fb61..4a1856d68 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libgcrypt PKG_VERSION:= 1.5.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 78f8f8bec4580f75b25816f7896d0389 PKG_DESCR:= GNU crypto library PKG_SECTION:= libs @@ -13,15 +13,11 @@ PKG_DEPENDS:= libgpg-error PKG_BUILDDEP:= libgpg-error PKG_URL:= http://directory.fsf.org/project/libgcrypt PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ - -PKG_SUBPKGS:= LIBGCRYPT LIBGCRYPT_DEV -PKGSD_LIBGCRYPT_DEV:= GNU crypto headers -PKGSC_LIBGCRYPT_DEV:= devel +PKG_OPTS:= dev include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBGCRYPT_DEV,libgcrypt-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGCRYPT_DEV},${PKGSC_LIBGCRYPT_DEV})) +$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ARGS+= --disable-asm \ --with-gpg-error-prefix="${STAGING_TARGET_DIR}/usr" @@ -31,12 +27,4 @@ libgcrypt-install: ${CP} ${WRKINST}/usr/lib/libgcrypt.so* \ ${IDIR_LIBGCRYPT}/usr/lib -libgcrypt-dev-install: - ${INSTALL_DIR} ${IDIR_LIBGCRYPT_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* \ - ${IDIR_LIBGCRYPT_DEV}/usr/include - ${INSTALL_DIR} ${IDIR_LIBGCRYPT_DEV}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/libgcrypt-config \ - ${IDIR_LIBGCRYPT_DEV}/usr/bin - include ${TOPDIR}/mk/pkg-bottom.mk |