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>

diff --git a/CHANGES b/CHANGES
index d12e3a87ce6bf24c9d0d75e2de5a913836d1eabe..2c03c9c23d60522aef2365efda038720d6ab6da9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 e95b6e8b829613dadca20c6fa6f9e5ab44071059..2bcd076cde3f77c1534500650fc403ee4c26eebb 100644 (file)
--- 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