diff options
| author | Simon Pasch <fpasch@googlemail.com> | 2009-10-13 14:23:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-10-13 14:23:08 +0200 |
| commit | f72f3fd30e6ad3c8edc5963636231e339f5824a0 (patch) | |
| tree | 345b3fd18d4a76870c6eb981a265e7982c8ba75f | |
| parent | f1b7d787642a8c79d116ebf5b308eb5053a065f5 (diff) | |
imagemagick: fix -clean target
Closes #657
imagemagick-clean target currently tries to remove $(TARGET_DIR) as
there is no IMAGEMAGICK_BINARY anymore.
Signed-off-by: Simon Pasch <fpasch@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | package/imagemagick/imagemagick.mk | 15 |
2 files changed, 4 insertions, 12 deletions
@@ -28,6 +28,7 @@ #617: netkit/inetd requires RPC and fails to build if RPC is disabled #619: netkittelnet requires netkitbase to install, but there's no dependency #653: [SECURITY] Update php package to version 5.2.11 + #657: Bug in imagemagick-clean target 2009.08, Released August 31th, 2009: diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index e95b6e8b8..2bcd076cd 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -9,8 +9,6 @@ IMAGEMAGICK_SOURCE:=ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2 IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION) IMAGEMAGICK_CAT:=$(BZCAT) -#IMAGEMAGICK_BINARY:=convert -#IMAGEMAGICK_TARGET_BINARY:=usr/bin/$(IMAGEMAGICK_BINARY) IMAGEMAGICK_LIB:=$(TARGET_DIR)/usr/lib/libMagickCore.so IMAGEMAGICK_TARGET_BINARIES:=$(TARGET_DIR)/usr/bin/animate @@ -137,16 +135,9 @@ imagemagick-source: $(DL_DIR)/$(IMAGEMAGICK_SOURCE) imagemagick-unpacked:$(IMAGEMAGICK_DIR)/.unpacked imagemagick-clean: - rm -f $(TARGET_DIR)/$(IMAGEMAGICK_TARGET_BINARY) - rm -f $(TARGET_DIR)/usr/bin/animate - rm -f $(TARGET_DIR)/usr/bin/compare - rm -f $(TARGET_DIR)/usr/bin/composite - rm -f $(TARGET_DIR)/usr/bin/conjure - rm -f $(TARGET_DIR)/usr/bin/convert - rm -f $(TARGET_DIR)/usr/bin/display - rm -f $(TARGET_DIR)/usr/bin/import - rm -f $(TARGET_DIR)/usr/bin/mogrify - rm -f $(TARGET_DIR)/usr/bin/montage + for target_binary in $(IMAGEMAGICK_TARGET_BINARIES); do \ + rm -f $$target_binary; \ + done rm -rf $(TARGET_DIR)/usr/lib/libMagick* rm -rf $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR) -$(MAKE) -C $(IMAGEMAGICK_DIR) clean |