diff options
| author | Malte Starostik <m-starostik@versanet.de> | 2010-07-24 13:21:25 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-30 10:45:00 +0200 |
| commit | bea9e43fe7d0adbcd472fb8b5f56aba5e2004f80 (patch) | |
| tree | 4adc93823fd5b305121ddbb801060512eb4d6c9b | |
| parent | e41dbc75f969aeb219ca81d590354946203ee1c0 (diff) | |
Globally remove aclocal directories from target
* Remove $(TARGET_DIR)/usr/share/aclocal from target-finalize when not
installing devfiles and
* Remove some (now) redundant cleanup from individual packages
Signed-off-by: Malte Starostik <m-starostik@versanet.de>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | package/gettext/gettext.mk | 2 | ||||
| -rw-r--r-- | package/libxml2/libxml2.mk | 3 | ||||
| -rw-r--r-- | package/multimedia/speex/speex.mk | 2 |
4 files changed, 3 insertions, 6 deletions
@@ -384,7 +384,7 @@ target-finalize: ifeq ($(BR2_HAVE_DEVFILES),y) ( scripts/copy.sh $(STAGING_DIR) $(TARGET_DIR) ) else - rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig + rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/aclocal find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f endif diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 80215c894..2b308c84a 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -135,8 +135,6 @@ gettext-dirclean: gettext-target: $(GETTEXT_DIR)/$(GETTEXT_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GETTEXT_DIR) install chmod +x $(TARGET_DIR)/usr/lib/libintl.so* # identify as needing to be stripped - rm -rf $(addprefix $(TARGET_DIR),/usr/share/aclocal /usr/include/libintl.h) - rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) cp -dpf $(STAGING_DIR)/usr/lib/libgettext*.so* \ diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 3a3e00706..8f2513684 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -34,8 +34,7 @@ $(eval $(call AUTOTARGETS,package,libxml2,host)) $(LIBXML2_HOOK_POST_INSTALL): $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config - rm -rf $(TARGET_DIR)/usr/share/aclocal touch $@ # libxml2 for the host -LIBXML2_HOST_BINARY:=$(HOST_DIR)/usr/bin/xmllint
\ No newline at end of file +LIBXML2_HOST_BINARY:=$(HOST_DIR)/usr/bin/xmllint diff --git a/package/multimedia/speex/speex.mk b/package/multimedia/speex/speex.mk index 6943ad730..e246b2491 100644 --- a/package/multimedia/speex/speex.mk +++ b/package/multimedia/speex/speex.mk @@ -32,5 +32,5 @@ $(SPEEX_TARGET_BUILD): $(SPEEX_TARGET_CONFIGURE) $(Q)touch $@ $(SPEEX_HOOK_POST_INSTALL): $(SPEEX_TARGET_INSTALL_TARGET) - rm -rf $(TARGET_DIR)/usr/share/doc/speex $(TARGET_DIR)/usr/share/aclocal + rm -rf $(TARGET_DIR)/usr/share/doc/speex touch $@ |