Commit 5dbea59f authored by Eric Andersen's avatar Eric Andersen
Browse files

more minor installation cleanups

parent a413a043

make/bash.mk

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY) 
	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(BASH_DIR) install

	mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/

	(cd $(TARGET_DIR)/bin; ln -fs bash sh)

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/junk

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \

		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc



bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)

make/coreutils.mk

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY): $(COREUTILS_DIR)/$(COREUTILS_BINARY) 
	ln -fs test $(TARGET_DIR)/usr/bin/[

	# gnu thinks chroot is in bin, debian thinks it's in sbin

	mv $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/junk

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \

		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc



coreutils: uclibc $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY)

make/findutils.mk

+3 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ $(FINDUTILS_DIR)/.configured: $(FINDUTILS_DIR)/.unpacked 
		--exec-prefix=/usr \

		--bindir=/usr/bin \

		--sbindir=/usr/sbin \

		--libexecdir=/usr/lib \

		--libexecdir=/usr/lib/locate \

		--sysconfdir=/etc \

		--datadir=/usr/share \

		--localstatedir=/var/lib \
@@ -46,7 +46,8 @@ $(FINDUTILS_DIR)/$(FINDUTILS_BINARY): $(FINDUTILS_DIR)/.configured 


$(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY): $(FINDUTILS_DIR)/$(FINDUTILS_BINARY)

	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(FINDUTILS_DIR) install

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/junk

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \

		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc



findutils: uclibc $(TARGET_DIR)/$(FINDUTILS_TARGET_BINARY)

make/gawk.mk

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ $(GAWK_DIR)/$(GAWK_BINARY): $(GAWK_DIR)/.configured 


$(TARGET_DIR)/$(GAWK_TARGET_BINARY): $(GAWK_DIR)/$(GAWK_BINARY)

	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(GAWK_DIR) install

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/junk

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \

		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc



gawk: uclibc $(TARGET_DIR)/$(GAWK_TARGET_BINARY)

make/gcc_target.mk

+4 −3
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump 
	    gxx_include_dir=$(TARGET_DIR)/usr/include/c++ \

	    toolexecdir=$(TARGET_DIR)/lib/gcc-lib/$(GNU_TARGET_NAME) \

	    -C $(BINUTILS_DIR2) install;

	rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \

		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc

	-$(STRIP) $(TARGET_DIR)/usr/$(GNU_TARGET_NAME)/bin/*

	-$(STRIP) $(TARGET_DIR)/usr/bin/*
@@ -200,8 +201,8 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled 
	    mandir=$(TARGET_DIR)/usr/man \

	    toolexecdir=$(TARGET_DIR)/lib/gcc-lib/$(GNU_TARGET_NAME) \

	    -C $(GCC_BUILD_DIR3) install;

	rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc \

		$(TARGET_DIR)/usr/share/locale

	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \

		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc

	(cd $(TARGET_DIR)/usr/bin; ln -fs gcc cc)

	-$(STRIP) $(TARGET_DIR)/bin/* 

	-$(STRIP) $(TARGET_DIR)/usr/bin/*