diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
| commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
| tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/gnutls | |
| parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
| parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/gnutls')
| -rw-r--r-- | package/gnutls/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 0d9a58a14..4745d1594 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -16,28 +16,30 @@ PKG_SITES:= ${MASTER_SITE_GNU:=gnutls/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_DESCR_GNUTLS_UTILS:= GNU TLS utilities +PKG_DEPENDS_GNUTLS_UTILS:= libgnutls libgnutls-extra + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_GNUTLS_UTILS},${PKG_DESCR_GNUTLS_UTILS},${PKG_SECTION})) $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ --with-libgcrypt-prefix=${STAGING_DIR}/usr \ --without-libz-prefix -BUILD_STYLE:= auto -INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutls.so.* ${IDIR_LIBGNUTLS}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgnutls.so* ${IDIR_LIBGNUTLS}/usr/lib ${INSTALL_DIR} ${IDIR_LIBGNUTLS_EXTRA}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutls-extra.so.* ${IDIR_LIBGNUTLS_EXTRA}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgnutls-extra.so* \ + ${IDIR_LIBGNUTLS_EXTRA}/usr/lib ${INSTALL_DIR} ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib - ${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so.* ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib + ${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so* \ + ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib ${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin ${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \ ${IDIR_GNUTLS_UTILS}/usr/bin |