diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
| commit | 27537f0ac386cd2d869a73d2c4d432be2dffb9eb (patch) | |
| tree | 8d0d6a6026aa6c0a7b5bbd777ef9ed65f916fa78 /package/file | |
| parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
resolve xterm Makefile conflict
Diffstat (limited to 'package/file')
| -rw-r--r-- | package/file/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/package/file/Makefile b/package/file/Makefile index faf974214..86147ed4e 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -14,14 +14,17 @@ PKG_URL:= http://www.darwinsys.com/file PKG_SITES:= ftp://ftp.fu-berlin.de/unix/tools/file/ \ ftp://ftp.astron.com/pub/file/ -PKG_SUBPKGS:= FILE LIBMAGIC +PKG_SUBPKGS:= FILE LIBMAGIC LIBMAGIC_DEV PKGSD_LIBMAGIC:= file type guesser library PKGSC_LIBMAGIC:= libs +PKGSD_LIBMAGIC_DEV:= file type guesser headers +PKGSC_LIBMAGIC_DEV:= devel include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBMAGIC,libmagic,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC},${PKGSD_LIBMAGIC},${PKGSC_LIBMAGIC})) +$(eval $(call PKG_template,LIBMAGIC_DEV,libmagic-dev,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBMAGIC_DEV},${PKGSD_LIBMAGIC_DEV},${PKGSC_LIBMAGIC_DEV})) pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ @@ -43,4 +46,8 @@ libmagic-install: ${INSTALL_DIR} ${IDIR_LIBMAGIC}/usr/lib ${CP} ${WRKINST}/usr/lib/libmagic.so* ${IDIR_LIBMAGIC}/usr/lib +libmagic-dev-install: + ${INSTALL_DIR} ${IDIR_LIBMAGIC_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBMAGIC_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk |