From 1afb8226cbaf011f81158b63c2c169ce05842d21 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 21 Aug 2007 14:32:38 +0000 Subject: - start to use BR2_HAVE_MANPAGES and BR2_HAVE_INFOPAGES - always error out if ldconfig for the target fails (was inconsistent..) --- target/cpio/cpioroot.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'target/cpio/cpioroot.mk') diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index b2b4c4951..42c5aecad 100644 --- a/target/cpio/cpioroot.mk +++ b/target/cpio/cpioroot.mk @@ -38,9 +38,13 @@ cpioroot-init: $(CPIO_BASE): host-fakeroot makedevs cpioroot-init -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; +ifneq ($(BR2_HAVE_MANPAGES),y) @rm -rf $(TARGET_DIR)/usr/man +endif +ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/info - -$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null +endif + $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null # Use fakeroot to pretend all target binaries are owned by root rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 -- cgit v1.2.3