From b5a211c68eb8f6a5c00910eb96c5339c37df65ab Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 27 Dec 2004 21:49:53 +0000 Subject: When both busybox and coreutils and/or util-linux are selected, make certain that it is coreutils and/or util-linux that actually gets their utilities installed. -Erik --- package/util-linux/util-linux.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'package/util-linux/util-linux.mk') diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index fd0b7240f..8cdce9690 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -60,7 +60,14 @@ $(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY) rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/share/info \ $(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/share/doc +#If both util-linux and busybox are selected, make certain util-linux +#wins the fight over who gets to have their utils actually installed +ifeq ($(BR2_PACKAGE_BUSYBOX),y) +util-linux: uclibc busybox $(UTIL-LINUX_TARGET_BINARY) +else util-linux: uclibc $(UTIL-LINUX_TARGET_BINARY) +endif + util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE) -- cgit v1.2.3