diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/libgd | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libgd')
| -rw-r--r-- | package/libgd/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/package/libgd/Makefile b/package/libgd/Makefile index 79f40aec1..4e6105e70 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gd PKG_VERSION:= 2.0.35 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 982963448dc36f20cb79b6e9ba6fdede PKG_DESCR:= A library for the dynamic creation of images PKG_SECTION:= libs @@ -13,17 +13,13 @@ PKG_DEPENDS:= libjpeg libpng PKG_BUILDDEP:= libpng jpeg PKG_URL:= http://www.libgd.org/ PKG_SITES:= http://www.libgd.org/releases/ - -PKG_SUBPKGS:= LIBGD LIBGD_DEV -PKGSC_LIBGD_DEV:= devel -PKGSD_LIBGD_DEV:= libgd headers +PKG_LIBNAME:= libgd +PKG_OPTS:= dev include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBGD_DEV,libgd-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBGD_DEV},${PKGSC_LIBGD_DEV})) +$(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -#CONFIGURE_ENV+= LIBPNG12_CONFIG="${STAGING_TARGET_DIR}/usr/bin/libpng12-config" CONFIGURE_ARGS+= --without-x \ --without-freetype \ --with-jpeg=${STAGING_TARGET_DIR}/usr \ @@ -34,8 +30,4 @@ libgd-install: ${INSTALL_DIR} ${IDIR_LIBGD}/usr/lib ${CP} ${WRKINST}/usr/lib/libgd.so* ${IDIR_LIBGD}/usr/lib -libgd-dev-install: - ${INSTALL_DIR} ${IDIR_LIBGD_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* ${IDIR_LIBGD_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk |