summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-28 20:12:48 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-28 20:12:48 +0000
commit23ac60b66ca9d7567696ed47f76a25c4fb4dc6aa (patch)
treee1c1103c88b1b4db4030a51526dbe511c6b9004a
parent3c0d0b56fb7f0d5458bc25c4854f0dbf06a82e0e (diff)
trivial changes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5668 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Makefile2
-rw-r--r--include/host.mk8
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index f157b9d3a9..e97423ee63 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ all: world
SHELL:=/usr/bin/env bash
export LC_ALL=C
export LANG=C
-export TOPDIR=${shell pwd}
+export TOPDIR=${CURDIR}
ifeq ($(KBUILD_VERBOSE),99)
MAKE:=3>/dev/null $(MAKE)
endif
diff --git a/include/host.mk b/include/host.mk
index 278ad726ff..4a434711c3 100644
--- a/include/host.mk
+++ b/include/host.mk
@@ -23,11 +23,11 @@ $(TMP_DIR)/.host.mk: $(TOPDIR)/include/host.mk
echo "HOST_OS:=$$HOST_OS" > $@; \
echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \
echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \
- TAR=`which gtar`; \
- [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar`; \
+ TAR=`which gtar 2>/dev/null`; \
+ [ -n "$$TAR" -a -x "$$TAR" ] || TAR=`which tar 2>/dev/null`; \
echo "TAR:=$$TAR" >> $@; \
- ZCAT=`which gzcat`; \
- [ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat`; \
+ ZCAT=`which gzcat 2>/dev/null`; \
+ [ -n "$$ZCAT" -a -x "$$ZCAT" ] || ZCAT=`which zcat 2>/dev/null`; \
echo "ZCAT:=$$ZCAT" >> $@; \
echo "BASH:=$(shell which bash)" >> $@; \
)