diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-22 19:29:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-22 19:29:20 +0200 |
| commit | d279b5d1fe744cac44da7cd1b51f9ba6a2cc4647 (patch) | |
| tree | bf575aca8f9ce9cf088ce3aee992fc846cd6e130 /package/bzip2 | |
| parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) | |
fix libmix packages, while checking all packages make some style cleanup
Diffstat (limited to 'package/bzip2')
| -rw-r--r-- | package/bzip2/Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index e842e7bc4..73a41a443 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -12,15 +12,21 @@ PKG_SECTION:= archive PKG_DEPENDS:= libbz2 PKG_URL:= http://www.bzip.org/ PKG_SITES:= http://www.bzip.org/${PKG_VERSION}/ -PKG_SUBPKGS:= BZIP2 LIBBZ2 +PKG_LIBNAME:= libbz2 +PKG_OPTS:= dev +PKG_SUBPKGS:= BZIP2 LIBBZ2 PKGSD_LIBBZ2:= bzip2 compression library PKGSC_LIBBZ2:= libs +ifeq ($(ADK_STATIC),y) +PKG_OPTS+= libmix +endif + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2})) +$(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2},${PKG_OPTS})) MAKE_FILE:= Makefile-libbz2_so CONFIG_STYLE:= manual @@ -36,6 +42,8 @@ libbz2-install: ${STAGING_DIR}/usr/lib (cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so) $(CP) $(WRKBUILD)/bzlib.h $(STAGING_DIR)/usr/include + ${INSTALL_DIR} $(LIBBZ2_DEV)/usr/include + $(CP) $(WRKBUILD)/bzlib.h $(LIBBZ2_DEV)/usr/include bzip2-install: ${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin |