diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:20:09 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:20:09 +0200 |
commit | c2bd3a43342e37a05a97e12581dd2bd52993877a (patch) | |
tree | 39f9427d581669d8f619b4df44c5c5548c8fd955 /package/libpng/Makefile | |
parent | ac46bdeef28bc2b65e1880884a79257c28e423a7 (diff) |
Revert "fix conflict, autoseect libgcj"
This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing
changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04.
Diffstat (limited to 'package/libpng/Makefile')
-rw-r--r-- | package/libpng/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 2deced6df..ed5808ecf 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libpng -PKG_VERSION:= 1.5.1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 220035f111ea045a51e290906025e8b5 +PKG_VERSION:= 1.2.44 +PKG_RELEASE:= 3 +PKG_MD5SUM:= 89b62f8daaeeab1342e307d6d1411ff1 PKG_DESCR:= A library for reading/writing PNG images PKG_SECTION:= libs PKG_DEPENDS:= zlib @@ -27,15 +27,14 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBPNG,libpng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBPNG_DEV,libpng-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPNG_DEV},${PKGSC_LIBPNG_DEV},${PKG_OPTS})) -#TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) - libpng-install: ${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib - ${CP} ${WRKINST}/usr/lib/libpng*.so* ${IDIR_LIBPNG}/usr/lib + ${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib libpng-dev-install: - ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBPNG_DEV}/usr/include + ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/include/libpng12 + ${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBPNG_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/libpng12/*.h ${IDIR_LIBPNG_DEV}/usr/include/libpng12 ${INSTALL_DIR} ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ ${IDIR_LIBPNG_DEV}/usr/lib/pkgconfig |