aboutsummaryrefslogtreecommitdiff
path: root/target/cpio/cpioroot.mk
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-08-21 14:32:38 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-08-21 14:32:38 +0000
commit1afb8226cbaf011f81158b63c2c169ce05842d21 (patch)
treee98b0ceb30d7dc264513db121b16dab45282c9a3 /target/cpio/cpioroot.mk
parent3cca2a310d5e6a793784c9c5c28076f161713077 (diff)
downloadbuildroot-1afb8226cbaf011f81158b63c2c169ce05842d21.tar.gz
buildroot-1afb8226cbaf011f81158b63c2c169ce05842d21.tar.bz2
- start to use BR2_HAVE_MANPAGES and BR2_HAVE_INFOPAGES
- always error out if ldconfig for the target fails (was inconsistent..)
Diffstat (limited to 'target/cpio/cpioroot.mk')
-rw-r--r--target/cpio/cpioroot.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk
index b2b4c4951f..42c5aecad2 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