diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
| commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
| tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /package/ImageMagick/Makefile | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/ImageMagick/Makefile')
| -rw-r--r-- | package/ImageMagick/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 648befeeb..9f16e819e 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a07a97cfb28b588cbcf83ffa9ec92e3f PKG_DESCR:= image processing and converting utility PKG_SECTION:= multimedia -PKG_BUILDDEP:= jpeg libtiff +PKG_BUILDDEP:= jpeg libtiff fontconfig libiconv PKG_DEPENDS:= libjpeg libtiff PKG_URL:= http://www.imagemagick.org/ PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ @@ -35,14 +35,10 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_CONVERT}+= convert-install -SUB_INSTALLS-${ADK_PACKAGE_DISPLAY}+= display-install +CONFIGURE_ARGS+= --with-magick-plus-plus=no \ + --enable-fast-install -CONFIGURE_ARGS+= --with-magick-plus-plus=no - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib $(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config $(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \ |