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>
This commit is contained in:
parent
e41dbc75f9
commit
bea9e43fe7
2
Makefile
2
Makefile
@ -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
|
||||
|
@ -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* \
|
||||
|
@ -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
|
||||
LIBXML2_HOST_BINARY:=$(HOST_DIR)/usr/bin/xmllint
|
||||
|
@ -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 $@
|
||||
|
Loading…
Reference in New Issue
Block a user