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/jpeg | |
parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) |
resolve xterm Makefile conflict
Diffstat (limited to 'package/jpeg')
-rw-r--r-- | package/jpeg/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index 911e5c474..4f12836d5 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -12,9 +12,9 @@ PKG_SECTION:= libs PKG_URL:= http://www.ijg.org/ PKG_SITES:= http://www.ijg.org/files/ -PKG_SUBPKGS:= LIBJPEG JPEG_DEV -PKGSD_JPEG_DEV:= development files for jpeg -PKGSC_JPEG_DEV:= devel +PKG_SUBPKGS:= LIBJPEG LIBJPEG_DEV +PKGSD_LIBJPEG_DEV:= development files for libjpeg +PKGSC_LIBJPEG_DEV:= devel DISTFILES:= ${PKG_NAME}src.v${PKG_VERSION}.tar.gz @@ -25,14 +25,14 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,JPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_JPEG_DEV},${PKGSC_JPEG_DEV})) +$(eval $(call PKG_template,LIBJPEG_DEV,libjpeg-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBJPEG_DEV},${PKGSC_LIBJPEG_DEV})) -post-install: +libjpeg-install: ${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib ${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/ -jpeg-dev-install: - ${INSTALL_DIR} ${IDIR_JPEG_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/*.h ${IDIR_JPEG_DEV}/usr/include +libjpeg-dev-install: + ${INSTALL_DIR} ${IDIR_LIBJPEG_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBJPEG_DEV}/usr/include include ${TOPDIR}/mk/pkg-bottom.mk |