From b3d0f31bdce9d43201be68461296d547be16c139 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 13 Dec 2006 22:51:37 +0000 Subject: [PATCH] - make sure to agree on the installation CONFIG_PREFIX --- package/busybox/busybox.mk | 2 ++ target/device/x86/i386/busybox.config | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 0ac97489d0..c06482e312 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -71,6 +71,8 @@ ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_2_2_1)),y) $(BUSYBOX_DIR)/.config ; endif ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y) + $(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \ + $(BUSYBOX_DIR)/.config ; $(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ $(BUSYBOX_DIR)/.config ; $(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ diff --git a/target/device/x86/i386/busybox.config b/target/device/x86/i386/busybox.config index d1b8a88d7f..73bd5336b8 100644 --- a/target/device/x86/i386/busybox.config +++ b/target/device/x86/i386/busybox.config @@ -57,7 +57,7 @@ CONFIG_DEBUG_YANK_SUSv2=y CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_APPLET_HARDLINKS is not set # CONFIG_INSTALL_APPLET_DONT is not set -PREFIX="./_install" +CONFIG_PREFIX="./_install" # # Busybox Library Tuning -- 2.30.2