A patch from Larry to fix pristine source builds (again).

I just can't seem to _not_ break it.  Sigh.

diff --git a/Makefile b/Makefile
index 91ed745c619af21aac71262b222dce3b4a8e014a..540e96ce75935208d3aa2ebff007b80b335b131c 100644 (file)
--- 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 2f9a905f53997f04fa3bedbf3500a727ad4028ec..6b25dff3b4ab81fff4702f389b956fb5c0ccd7dd 100755 (executable)
--- 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 2f9a905f53997f04fa3bedbf3500a727ad4028ec..6b25dff3b4ab81fff4702f389b956fb5c0ccd7dd 100755 (executable)
--- 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' ' '