diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-03-14 11:15:08 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-03-14 11:15:08 +0000 |
| commit | 7e1cdc67d366866d92d27991e0c23cc08367ccd5 (patch) | |
| tree | 7533b3934907c247e43e424c0f45435287953bb3 | |
| parent | 15177a6e9566e2929e77eda44eff5116b6f0e587 (diff) | |
- s/HOST_SED_TARGET/HOST_SED_BINARY/g for clarity
- make sure that we have a working sed for the uclibc-menuconfig target
| -rw-r--r-- | package/sed/sed.mk | 8 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package/sed/sed.mk b/package/sed/sed.mk index fea8af2ef..70bccea0a 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -17,7 +17,7 @@ endif #HOST_SED_DIR:=$(STAGING_DIR) HOST_SED_DIR:=$(TOOL_BUILD_DIR) SED:=$(HOST_SED_DIR)/bin/sed -i -e -HOST_SED_TARGET=$(shell package/sed/sedcheck.sh) +HOST_SED_BINARY=$(shell package/sed/sedcheck.sh) HOST_SED_IF_ANY=$(shell toolchain/dependencies/check-host-sed.sh) $(DL_DIR)/$(SED_SOURCE): @@ -63,15 +63,15 @@ build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY) $(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; fi use-sed-host-binary: - @if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \ + if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \ mkdir -p "$(HOST_SED_DIR)/bin"; \ rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \ ln -sf "$(HOST_SED_IF_ANY)" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \ fi -host-sed: $(HOST_SED_TARGET) +host-sed: $(HOST_SED_BINARY) -ifeq ($(HOST_SED_TARGET),build-sed-host-binary) +ifeq ($(HOST_SED_BINARY),build-sed-host-binary) host-sed-clean: $(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) uninstall -$(MAKE) -C $(SED_DIR1) clean diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 13da717e5..048f07f47 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -254,7 +254,7 @@ $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET) all touch -c $(UCLIBC_DIR)/lib/libc.a -uclibc-menuconfig: $(UCLIBC_DIR)/.config host-sed +uclibc-menuconfig: host-sed $(UCLIBC_DIR)/.config $(MAKE1) -C $(UCLIBC_DIR) \ PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ DEVEL_PREFIX=/usr/ \ |