Do not let packages remove man pages, info pages and documentation

The cleanup of $(TARGET_DIR)/usr/share/man, $(TARGET_DIR)/usr/man,
$(TARGET_DIR)/usr/share/info, $(TARGET_DIR)/usr/info,
$(TARGET_DIR)/usr/share/doc and $(TARGET_DIR)/usr/doc is already done
globally in the main Makefile. Therefore, there's no need to handle
that on a per-package basis.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index b7fc716873d6adf65bf6e1d597a90ea6e3240a23..5abae559bb018f87bfa996c88f7579fe343bacbb 100644 (file)
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -81,14 +81,7 @@ $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
        rm -f $(TARGET_DIR)/bin/bash*
        mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
        (cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
        rm -rf $(TARGET_DIR)/share/locale
-       rm -rf $(TARGET_DIR)/usr/share/doc
 
 # If both bash and busybox are selected, make certain bash wins
 # the fight over who gets to own the /bin/sh symlink.

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 716d645de4dce8b6fbbe51eb1316899e9030c524..f15df6af8b425e465553fc1b849618fac73bd820 100644 (file)
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -60,14 +60,7 @@ $(STAGING_DIR)/lib/$(DB_SHARLIB): $(DB_DIR)/build_unix/.libs/$(DB_SHARLIB)
        $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DB_DIR)/build_unix install
        chmod a-x $(STAGING_DIR)/lib/libdb*so*
        rm -f $(STAGING_DIR)/bin/db_*
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(STAGING_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(STAGING_DIR)/usr/share/man
-endif
        rm -rf $(STAGING_DIR)/share/locale
-       rm -rf $(STAGING_DIR)/usr/share/doc
 
 $(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)
        rm -rf $(TARGET_DIR)/lib/libdb*

diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 32ed7c7198504963b737a9146b9f5d6fb403ba1d..f29259fd5b93ddb64a7b675ce805b3df24477e45 100644 (file)
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -52,14 +52,7 @@ $(BISON_DIR)/$(BISON_BINARY): $(BISON_DIR)/.configured
 
 $(TARGET_DIR)/$(BISON_TARGET_BINARY): $(BISON_DIR)/$(BISON_BINARY)
        $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) install
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
        rm -rf $(TARGET_DIR)/share/locale
-       rm -rf $(TARGET_DIR)/usr/share/doc
        cp -a package/bison/yacc $(TARGET_DIR)/usr/bin/yacc
 
 bison: $(TARGET_DIR)/$(BISON_TARGET_BINARY)

diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 85a5491b6b27b5de20f4605ee2dc5dc1766b2fd6..208199402e46e436e3741b474826b0a90596fc4c 100644 (file)
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -118,14 +118,7 @@ $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY): $(COREUTILS_DIR)/$(COREUTILS_BINARY)
        # gnu thinks chroot is in bin, debian thinks it's in sbin
        mv $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot
        $(STRIPCMD) $(TARGET_DIR)/usr/sbin/chroot > /dev/null 2>&1
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
        rm -rf $(TARGET_DIR)/share/locale
-       rm -rf $(TARGET_DIR)/usr/share/doc
 
 # If both coreutils and busybox are selected, make certain coreutils
 # wins the fight over who gets to have their utils actually installed.

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 4ae5bc7144259f880177a6a4a6567c635bf5dcb9..57e0a5dcd87ee27455c60177f24b0e8772b555a3 100644 (file)
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -57,14 +57,7 @@ $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
        mkdir -p $(TARGET_DIR)/etc/dhcp
        $(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf \
                $(TARGET_DIR)/etc/dhcp/dhcpd.conf
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/man
-endif
        rm -rf $(TARGET_DIR)/share/locale
-       rm -rf $(TARGET_DIR)/usr/share/doc
 
 $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
        mkdir -p $(TARGET_DIR)/var/lib
@@ -74,15 +67,6 @@ $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
        mkdir -p $(TARGET_DIR)/etc/init.d
        $(INSTALL) -m 0755 -D package/dhcp/S80dhcp-relay \
                $(TARGET_DIR)/etc/init.d
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/man
-endif
-       # Why on earth do we wipe out whole directories here?
-       #rm -rf $(TARGET_DIR)/usr/share/locale
-       #rm -rf $(TARGET_DIR)/usr/share/doc
 
 $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
        mkdir -p $(TARGET_DIR)/var/lib
@@ -94,15 +78,6 @@ $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
                $(TARGET_DIR)/etc/dhcp/dhclient.conf
        $(INSTALL) -m 0755 -D package/dhcp/dhclient-script \
                $(TARGET_DIR)/sbin/dhclient-script
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/man
-endif
-       # Why on earth do we wipe out whole directories here?
-       #rm -rf $(TARGET_DIR)/usr/share/locale
-       #rm -rf $(TARGET_DIR)/usr/share/doc
 
 dhcp_server: $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY)
 

diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index 1f566609510383d529921ddad98f5bcc23db2300..9c6f2a980c9f92256aa3caed2e97d0d0c0366840 100644 (file)
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -39,9 +39,6 @@ $(TARGET_DIR)/$(DIALOG_TARGET_BINARY): $(DIALOG_DIR)/$(DIALOG_BINARY)
        $(MAKE) prefix=$(TARGET_DIR)/usr \
                mandir=$(TARGET_DIR)/usr/share/man \
                -C $(DIALOG_DIR) install
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -Rf $(TARGET_DIR)/usr/share/man
-endif
 
 dialog: ncurses $(TARGET_DIR)/$(DIALOG_TARGET_BINARY)
 

diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index fe1bab8418e79dafb67bc5bada102154e466c676..fd5e5a318f9efb4c43fcf894c013068ef94f302a 100644 (file)
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -90,12 +90,6 @@ $(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY): $(DIFFUTILS_DIR)/.configured
 $(TARGET_DIR)/$(DIFFUTILS_TARGET_BINARY): $(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY)
        $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DIFFUTILS_DIR) \
                $(if $(BR2_STRIP_none),install,install-strip)
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
 ifneq ($(BR2_ENABLE_LOCALE),y)
        rm -rf $(TARGET_DIR)/usr/share/locale
 endif

diff --git a/package/file/file.mk b/package/file/file.mk
index 579b9438645676f3b077181f45738c5ee15a9a2c..6a761177facbe088d0fcb52631f9f8bf662b34e8 100644 (file)
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -91,14 +91,7 @@ $(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOLCHAIN_DIR)/bin/file
 $(TARGET_DIR)/$(FILE_TARGET_BINARY): $(FILE_DIR2)/$(FILE_BINARY)
        $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(FILE_DIR2) install
        -($(STRIPCMD) $(TARGET_DIR)/usr/lib/libmagic.so.*.* > /dev/null 2>&1)
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
        rm -rf $(TARGET_DIR)/share/locale
-       rm -rf $(TARGET_DIR)/usr/share/doc
        mv $(TARGET_DIR)/lib/libmagic.a $(STAGING_DIR)/lib
        rm -f $(TARGET_DIR)/lib/libmagic.la
        mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/usr/include

diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index ee304259893a9b77a98c8315c14225edb303252d..96e2682a12a46831217a35e369b9595c386767f6 100644 (file)
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -62,14 +62,7 @@ findutils-target_binary: $(FINDUTILS_DIR)/$(FINDUTILS_BINARY)
                $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FINDUTILS_DIR) install-strip; \
                $(STRIPCMD) $(TARGET_DIR)/usr/lib/locate/* > /dev/null 2>&1; \
        fi
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
        rm -rf $(TARGET_DIR)/share/locale
-       rm -rf $(TARGET_DIR)/usr/share/doc
 
 findutils: findutils-target_binary
 

diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 71e943cce2fb85a26d029150ccee5fe368ba1f8c..8886e6b3dc2d2e76277531b26168cda178267d76 100644 (file)
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -56,14 +56,7 @@ $(TARGET_DIR)/$(GAWK_TARGET_BINARY): $(GAWK_DIR)/$(GAWK_BINARY)
        rm -f $(TARGET_DIR)/usr/bin/gawk-*
        (cd $(TARGET_DIR)/usr/bin; ln -snf gawk awk)
        $(STRIPCMD) $(TARGET_DIR)/usr/lib/awk/* > /dev/null 2>&1
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
        rm -rf $(TARGET_DIR)/share/locale
-       rm -rf $(TARGET_DIR)/usr/share/doc
 
 gawk: $(TARGET_DIR)/$(GAWK_TARGET_BINARY)
 

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 81ab9debc16a191823abc7cf7e2435833b971e5c..5b045603c29a36e74afe69251193618e1704289b 100644 (file)
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -135,14 +135,7 @@ 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
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/man
-endif
-       rm -rf $(addprefix $(TARGET_DIR),/usr/share/doc \
-               /usr/doc /usr/share/aclocal /usr/include/libintl.h)
+       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)

diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index fc3c84000e1cbe6b348d81c554670250fb790d5e..3feb49a46fa3b1a9b59c48bcef4c688cc11f0cb7 100644 (file)
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -41,12 +41,6 @@ $(GZIP_BINARY): $(GZIP_DIR)/.configured
 
 $(GZIP_TARGET_BINARY): $(GZIP_BINARY)
        $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GZIP_DIR) install-strip
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
 
 gzip: $(GZIP_TARGET_BINARY)
 

diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 38cd57ba4df477f9140a6ed0db9205f165f6426c..911da7cc2b7290d3999d669d908401007c435b5c 100644 (file)
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -121,13 +121,6 @@ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL): \
          $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
          $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
          $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -f $(addprefix $(TARGET_DIR)/usr/man/, \
-               man3/ipsec_strerror.3 man3/ipsec_set_policy.3 \
-               man5/racoon.conf.5 \
-               man8/racoonctl.8 man8/racoon.8 \
-               man8/plainrsa-gen.8 man8/setkey.8)
-endif
 ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS), y)
        install -D $(addprefix $(IPSEC_TOOLS_DIR)/src/, \
                libipsec/.libs/libipsec.a libipsec/.libs/libipsec.la \

diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 6840b99c609fba825a4e6a208b2aa3f277dfde1a..b30d35643623a7a3873d0bc061c84a5720373c8f 100644 (file)
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -56,9 +56,6 @@ liblockfile-clean:
        rm -f $(TARGET_DIR)/usr/lib/liblockfile.so*
        rm -f $(STAGING_DIR)/usr/lib/liblockfile*
        rm -f $(addprefix $(STAGING_DIR)/usr/include/,lockfile.h mailfile.h)
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(STAGING_DIR)/usr/share/man
-endif
        -$(MAKE) -C $(LIBLOCKFILE_DIR) clean
 
 liblockfile-dirclean:

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index c589e255f87156410ab7e1d5be5dd2d15fa656be..fb0151c8d62db3b42c0677cf3be6660dec1bb0bb 100644 (file)
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -111,13 +111,6 @@ $(TARGET_DIR)/usr/sbin/snmpd: $(NETSNMP_DIR)/agent/snmpd
            includedir=$(STAGING_DIR)/usr/include/net-snmp \
            ucdincludedir=$(STAGING_DIR)/usr/include/ucd-snmp \
            -C $(NETSNMP_DIR) install
-       rm -rf $(TARGET_DIR)/usr/share/doc
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
        # Copy the .conf files.
        $(INSTALL) -D -m 0644 $(NETSNMP_DIR)/EXAMPLE.conf $(TARGET_DIR)/etc/snmp/snmpd.conf
        -mv $(TARGET_DIR)/usr/share/snmp/mib2c*.conf $(TARGET_DIR)/etc/snmp

diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index d2f0616c69c5fcb00e44130f7b7fac8d78857a04..30ebd359b3a6461f2ac36a27f058d06d96519613 100644 (file)
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -159,12 +159,6 @@ $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY): $(QUAGGA_BINARY)
 ifneq ($(BR2_PACKAGE_QUAGGA_HEADERS),y)
        rm -rf $(TARGET_DIR)/usr/include/quagga
 endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/man
-endif
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/info
-endif
 
 quagga: $(QUAGGA_DEPENDENCIES) $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY)
 

diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 3445deb6304aba7b889db37c2cf6058b5bc7e995..650872569522dc6c9f7c867c2003d1663c55a9ca 100644 (file)
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -65,12 +65,6 @@ build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
                rm -rf $(HOST_SED_DIR)/share/locale; \
                rm -rf $(HOST_SED_DIR)/usr/share/doc; \
        fi
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(HOST_SED_DIR)/usr/man/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(HOST_SED_DIR)/usr/share/man
-endif
 
 $(HOST_SED_DIR)/$(SED_TARGET_BINARY):
        if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ]; then \
@@ -152,12 +146,6 @@ sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
                rm -rf $(TARGET_DIR)/share/locale; \
                rm -rf $(TARGET_DIR)/usr/share/doc; \
        fi
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -rf $(TARGET_DIR)/usr/share/man
-endif
 
 sed: sed-target_binary
 

diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index ba22ba4eef1e5d3047016e90bf8e133a806a78bf..3e0823ad369d31567011dc2de601b3dc7b40f879 100644 (file)
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -73,10 +73,6 @@ ifneq ($(BR2_PACKAGE_UDPCAST_RECEIVER),y)
        rm -f $(TARGET_DIR)/usr/sbin/udp-receiver
        rm -f $(TARGET_DIR)/usr/sbin/udp-receiver.1
 endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-       rm -f $(addprefix $(TARGET_DIR)/usr/man/, \
-               $(addsuffix .1,$(UDPCAST_BINARIES)))
-endif
 
 udpcast: $(UDPCAST_PROGS)
 

diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index 3f48c18aabfafd73638db0acdfa953c46397a3c1..c24acc4b5bae48e993428598f74faa5023b86ead 100644 (file)
--- a/toolchain/binutils/binutils.mk
+++ b/toolchain/binutils/binutils.mk
@@ -151,13 +151,7 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump
        $(MAKE) DESTDIR=$(TARGET_DIR) \
                tooldir=/usr build_tooldir=/usr \
                -C $(BINUTILS_DIR2) install
-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
+       rm -rf $(TARGET_DIR)/share/locale
        -$(STRIPCMD) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1
        -$(STRIPCMD) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1