Merge branch 'for-2011.05/remove-config-scripts' of git://git.busybox.net/~tpetazzoni/git/buildroot

6 files changed, 51 insertions, 0 deletions

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 97c00410f..7955db7f5 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -80,4 +80,14 @@ else
 IMAGEMAGICK_CONF_OPT += --without-tiff
 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 $(call AUTOTARGETS,package,imagemagick))
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index eb67b055a..6dfecf90c 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -31,4 +31,12 @@ endef
 
 LIBDNET_POST_EXTRACT_HOOKS += LIBDNET_FIXUP_ACINCLUDE_M4
 
+define LIBDNET_REMOVE_CONFIG_SCRIPT
+	$(RM) -f $(TARGET_DIR)/usr/bin/dnet-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBDNET_POST_INSTALL_TARGET_HOOKS += LIBDNET_REMOVE_CONFIG_SCRIPT
+endif
+
 $(eval $(call AUTOTARGETS,package,libdnet))
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 699561b9a..e64989dff 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -22,5 +22,14 @@ endef
 
 LIBPNG_POST_INSTALL_STAGING_HOOKS += LIBPNG_STAGING_LIBPNG12_CONFIG_FIXUP
 
+define LIBPNG_REMOVE_CONFIG_SCRIPTS
+	$(RM) -f $(TARGET_DIR)/usr/bin/libpng$(LIBPNG_SERIES)-config \
+		 $(TARGET_DIR)/usr/bin/libpng-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBPNG_POST_INSTALL_TARGET_HOOKS += LIBPNG_REMOVE_CONFIG_SCRIPTS
+endif
+
 $(eval $(call AUTOTARGETS,package,libpng))
 $(eval $(call AUTOTARGETS,package,libpng,host))
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index d07f631a8..2a267b2f9 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -30,6 +30,14 @@ HOST_LIBXML2_CONF_OPT = \
 		--enable-shared --without-debugging --without-python \
 		--without-threads
 
+define LIBXML2_REMOVE_CONFIG_SCRIPTS
+	$(RM) -f $(TARGET_DIR)/usr/bin/xml2-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBXML2_POST_INSTALL_TARGET_HOOKS += LIBXML2_REMOVE_CONFIG_SCRIPTS
+endif
+
 $(eval $(call AUTOTARGETS,package,libxml2))
 $(eval $(call AUTOTARGETS,package,libxml2,host))
 
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 5fa2f4ce4..1efdcf8c2 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -39,5 +39,13 @@ endef
 
 LIBXSLT_POST_INSTALL_STAGING_HOOKS += LIBXSLT_XSLT_CONFIG_FIXUP
 
+define LIBXSLT_REMOVE_CONFIG_SCRIPTS
+	$(RM) -f $(TARGET_DIR)/usr/bin/xslt-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+LIBXSLT_POST_INSTALL_TARGET_HOOKS += LIBXSLT_REMOVE_CONFIG_SCRIPTS
+endif
+
 $(eval $(call AUTOTARGETS,package,libxslt))
 $(eval $(call AUTOTARGETS,package,libxslt,host))
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index c570fc1da..0c237dcaf 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -45,4 +45,12 @@ else
 NEON_CONF_OPT+=--without-ssl
 endif
 
+define NEON_REMOVE_CONFIG_SCRIPTS
+	$(RM) -f $(TARGET_DIR)/usr/bin/neon-config
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+NEON_POST_INSTALL_TARGET_HOOKS += NEON_REMOVE_CONFIG_SCRIPTS
+endif
+
 $(eval $(call AUTOTARGETS,package,neon))