From a5ce8576748421b6dece97a665e575d7dfc9fbe8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 7 Feb 2013 12:35:05 +0000 Subject: package: use _CONFIG_SCRIPTS wherever possible Use the _CONFIG_SCRIPTS mechanism in all packages for which it does all what the package was doing. A few packages, like libxslt, are for now left out, since they need some additional fixup (for example a fixup of includedir). Signed-off-by: Thomas Petazzoni Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.mk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'package/imagemagick') diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 0476ace70..722ab4003 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -16,6 +16,8 @@ IMAGEMAGICK_LICENSE_FILES = LICENSE IMAGEMAGICK_INSTALL_STAGING = YES IMAGEMAGICK_AUTORECONF = YES +IMAGEMAGICK_CONFIG_SCRIPTS = \ + $(addsuffix -config,Magick MagickCore MagickWand Wand Magick++) ifeq ($(BR2_LARGEFILE),y) IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64 @@ -113,14 +115,4 @@ else IMAGEMAGICK_CONF_OPT += --without-bzip2 endif -define IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS - $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/, \ - $(addsuffix -config, \ - Magick MagickCore MagickWand Wand Magick++)) -endef - -ifneq ($(BR2_HAVE_DEVFILES),y) -IMAGEMAGICK_POST_INSTALL_TARGET_HOOKS += IMAGEMAGICK_REMOVE_CONFIG_SCRIPTS -endif - $(eval $(autotools-package)) -- cgit v1.2.3