diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-05-01 01:40:34 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-05-01 01:40:34 +0000 |
commit | 3f99b567b8500be6095f4ef36d6733873ebfe0c8 (patch) | |
tree | 2b9edb6ec300c1f1ac9e1bddb537d7e64acb67ef | |
parent | aac75e5a7818ce944dc21cabb69920e7ba78c902 (diff) | |
download | busybox-w32-3f99b567b8500be6095f4ef36d6733873ebfe0c8.tar.gz busybox-w32-3f99b567b8500be6095f4ef36d6733873ebfe0c8.tar.bz2 busybox-w32-3f99b567b8500be6095f4ef36d6733873ebfe0c8.zip |
A patch from Larry to fix pristine source builds (again).
I just can't seem to _not_ break it. Sigh.
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | applets/busybox.sh | 2 | ||||
-rwxr-xr-x | busybox.sh | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -274,7 +274,7 @@ sh.c: | |||
274 | @if [ ! -L sh.c ] ; then ln -s lash.c sh.c ; fi | 274 | @if [ ! -L sh.c ] ; then ln -s lash.c sh.c ; fi |
275 | 275 | ||
276 | applet_source_list: sh.c busybox.sh Config.h | 276 | applet_source_list: sh.c busybox.sh Config.h |
277 | (echo -n "APPLET_SOURCES := "; $(SHELL) $(filter-out sh.c, $^) $(BB_SRC_DIR)) > $@ | 277 | (echo -n "APPLET_SOURCES := "; BB_SRC_DIR=$(BB_SRC_DIR) $(SHELL) $^) > $@ |
278 | 278 | ||
279 | doc: olddoc | 279 | doc: olddoc |
280 | 280 | ||
diff --git a/applets/busybox.sh b/applets/busybox.sh index 2f9a905f5..6b25dff3b 100755 --- a/applets/busybox.sh +++ b/applets/busybox.sh | |||
@@ -9,7 +9,7 @@ RAW=` \ | |||
9 | | tr A-Z a-z | sort | 9 | | tr A-Z a-z | sort |
10 | ` | 10 | ` |
11 | test "${RAW}" != "" || exit | 11 | test "${RAW}" != "" || exit |
12 | cd ${2:-.} | 12 | if [ -d $BB_SRC_DIR ]; then cd $BB_SRC_DIR; fi |
13 | # By running $RAW through "ls", we avoid listing | 13 | # By running $RAW through "ls", we avoid listing |
14 | # source files that don't exist. | 14 | # source files that don't exist. |
15 | ls $RAW 2>/dev/null | tr '\n' ' ' | 15 | ls $RAW 2>/dev/null | tr '\n' ' ' |
diff --git a/busybox.sh b/busybox.sh index 2f9a905f5..6b25dff3b 100755 --- a/busybox.sh +++ b/busybox.sh | |||
@@ -9,7 +9,7 @@ RAW=` \ | |||
9 | | tr A-Z a-z | sort | 9 | | tr A-Z a-z | sort |
10 | ` | 10 | ` |
11 | test "${RAW}" != "" || exit | 11 | test "${RAW}" != "" || exit |
12 | cd ${2:-.} | 12 | if [ -d $BB_SRC_DIR ]; then cd $BB_SRC_DIR; fi |
13 | # By running $RAW through "ls", we avoid listing | 13 | # By running $RAW through "ls", we avoid listing |
14 | # source files that don't exist. | 14 | # source files that don't exist. |
15 | ls $RAW 2>/dev/null | tr '\n' ' ' | 15 | ls $RAW 2>/dev/null | tr '\n' ' ' |