summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-05-01 01:40:34 +0000
committerEric Andersen2001-05-01 01:40:34 +0000
commit3f99b567b8500be6095f4ef36d6733873ebfe0c8 (patch)
tree2b9edb6ec300c1f1ac9e1bddb537d7e64acb67ef
parentaac75e5a7818ce944dc21cabb69920e7ba78c902 (diff)
downloadbusybox-3f99b567b8500be6095f4ef36d6733873ebfe0c8.zip
busybox-3f99b567b8500be6095f4ef36d6733873ebfe0c8.tar.gz
A patch from Larry to fix pristine source builds (again).
I just can't seem to _not_ break it. Sigh.
-rw-r--r--Makefile2
-rwxr-xr-xapplets/busybox.sh2
-rwxr-xr-xbusybox.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 91ed745..540e96c 100644
--- a/Makefile
+++ b/Makefile
@@ -274,7 +274,7 @@ sh.c:
@if [ ! -L sh.c ] ; then ln -s lash.c sh.c ; fi
applet_source_list: sh.c busybox.sh Config.h
- (echo -n "APPLET_SOURCES := "; $(SHELL) $(filter-out sh.c, $^) $(BB_SRC_DIR)) > $@
+ (echo -n "APPLET_SOURCES := "; BB_SRC_DIR=$(BB_SRC_DIR) $(SHELL) $^) > $@
doc: olddoc
diff --git a/applets/busybox.sh b/applets/busybox.sh
index 2f9a905..6b25dff 100755
--- a/applets/busybox.sh
+++ b/applets/busybox.sh
@@ -9,7 +9,7 @@ RAW=` \
| tr A-Z a-z | sort
`
test "${RAW}" != "" || exit
-cd ${2:-.}
+if [ -d $BB_SRC_DIR ]; then cd $BB_SRC_DIR; fi
# By running $RAW through "ls", we avoid listing
# source files that don't exist.
ls $RAW 2>/dev/null | tr '\n' ' '
diff --git a/busybox.sh b/busybox.sh
index 2f9a905..6b25dff 100755
--- a/busybox.sh
+++ b/busybox.sh
@@ -9,7 +9,7 @@ RAW=` \
| tr A-Z a-z | sort
`
test "${RAW}" != "" || exit
-cd ${2:-.}
+if [ -d $BB_SRC_DIR ]; then cd $BB_SRC_DIR; fi
# By running $RAW through "ls", we avoid listing
# source files that don't exist.
ls $RAW 2>/dev/null | tr '\n' ' '