Commit bea9e43f authored by Malte Starostik's avatar Malte Starostik Committed by Peter Korsgaard
Browse files

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: default avatarMalte Starostik <m-starostik@versanet.de>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent e41dbc75

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

package/gettext/gettext.mk

+0 −2
Original line number Diff line number Diff line
@@ -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* \

package/libxml2/libxml2.mk

+1 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ $(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

package/multimedia/speex/speex.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 $@