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/jffs2/jffs2root.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'target/jffs2') diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 2d4a325a0..869668bc8 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -50,11 +50,15 @@ endif # $(JFFS2_TARGET): host-fakeroot makedevs mtd-host -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; +ifneq ($(BR2_HAVE_MANPAGES),y) @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/share/man +endif +ifneq ($(BR2_HAVE_INFOPAGES),y) @rm -rf $(TARGET_DIR)/usr/info +endif @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share - -$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null + $(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 $(JFFS2_TARGET)) touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 -- cgit v1.2.3