mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 14:46:31 +00:00
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>
This commit is contained in:
parent
f1b7d78764
commit
f72f3fd30e
1
CHANGES
1
CHANGES
@ -28,6 +28,7 @@
|
|||||||
#617: netkit/inetd requires RPC and fails to build if RPC is disabled
|
#617: netkit/inetd requires RPC and fails to build if RPC is disabled
|
||||||
#619: netkittelnet requires netkitbase to install, but there's no dependency
|
#619: netkittelnet requires netkitbase to install, but there's no dependency
|
||||||
#653: [SECURITY] Update php package to version 5.2.11
|
#653: [SECURITY] Update php package to version 5.2.11
|
||||||
|
#657: Bug in imagemagick-clean target
|
||||||
|
|
||||||
2009.08, Released August 31th, 2009:
|
2009.08, Released August 31th, 2009:
|
||||||
|
|
||||||
|
@ -9,8 +9,6 @@ IMAGEMAGICK_SOURCE:=ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
|
|||||||
IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
|
IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
|
||||||
IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
|
IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
|
||||||
IMAGEMAGICK_CAT:=$(BZCAT)
|
IMAGEMAGICK_CAT:=$(BZCAT)
|
||||||
#IMAGEMAGICK_BINARY:=convert
|
|
||||||
#IMAGEMAGICK_TARGET_BINARY:=usr/bin/$(IMAGEMAGICK_BINARY)
|
|
||||||
IMAGEMAGICK_LIB:=$(TARGET_DIR)/usr/lib/libMagickCore.so
|
IMAGEMAGICK_LIB:=$(TARGET_DIR)/usr/lib/libMagickCore.so
|
||||||
|
|
||||||
IMAGEMAGICK_TARGET_BINARIES:=$(TARGET_DIR)/usr/bin/animate
|
IMAGEMAGICK_TARGET_BINARIES:=$(TARGET_DIR)/usr/bin/animate
|
||||||
@ -137,16 +135,9 @@ imagemagick-source: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
|
|||||||
imagemagick-unpacked:$(IMAGEMAGICK_DIR)/.unpacked
|
imagemagick-unpacked:$(IMAGEMAGICK_DIR)/.unpacked
|
||||||
|
|
||||||
imagemagick-clean:
|
imagemagick-clean:
|
||||||
rm -f $(TARGET_DIR)/$(IMAGEMAGICK_TARGET_BINARY)
|
for target_binary in $(IMAGEMAGICK_TARGET_BINARIES); do \
|
||||||
rm -f $(TARGET_DIR)/usr/bin/animate
|
rm -f $$target_binary; \
|
||||||
rm -f $(TARGET_DIR)/usr/bin/compare
|
done
|
||||||
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
|
|
||||||
rm -rf $(TARGET_DIR)/usr/lib/libMagick*
|
rm -rf $(TARGET_DIR)/usr/lib/libMagick*
|
||||||
rm -rf $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)
|
rm -rf $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)
|
||||||
-$(MAKE) -C $(IMAGEMAGICK_DIR) clean
|
-$(MAKE) -C $(IMAGEMAGICK_DIR) clean
|
||||||
|
Loading…
x
Reference in New Issue
Block a user