From 51f5bccbc9cbc4b8f38edfd3d15c5c6022cc3bbf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 5 Dec 2008 15:27:42 +0000 Subject: [PATCH] toolchain/binutils: honour HAVE_MANPAGES / HAVE_INFOPAGES Based on b157db55 in Bernhard's tree. --- toolchain/binutils/binutils.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 32b3a2cb74..f388295fff 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -106,6 +106,8 @@ $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched --build=$(GNU_HOST_NAME) \ --host=$(GNU_HOST_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ $(BR2_CONFIGURE_DEVEL_SYSROOT) \ $(BR2_CONFIGURE_STAGING_SYSROOT) \ $(DISABLE_NLS) \ @@ -158,6 +160,8 @@ $(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ --target=$(REAL_GNU_TARGET_NAME) \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ $(DISABLE_NLS) \ $(MULTILIB) \ $(BINUTILS_TARGET_CONFIG_OPTIONS) \ @@ -174,8 +178,13 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump $(MAKE) DESTDIR=$(TARGET_DIR) \ tooldir=/usr build_tooldir=/usr \ -C $(BINUTILS_DIR2) install - #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc +ifneq ($(BR2_HAVE_MANPAGES),y) + rm -rf $(TARGET_DIR)/usr/man +endif +ifneq ($(BR2_HAVE_INFOPAGES),y) + rm -rf $(TARGET_DIR)/usr/info +endif + rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/share/doc -$(STRIPCMD) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1 -$(STRIPCMD) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1 -- 2.30.2