[BusyBox] fix pristine source builds (again)

Larry Doolittle ldoolitt at recycle.lbl.gov
Mon Apr 30 13:37:32 UTC 2001


Mostly fixes pristine source builds (again).
Even with this patch, you need to have lash/hush configured
with a symlink in the pristine source directory.

      - Larry


diff -urN /home/ldoolitt/cvs/busybox/Makefile busybox-trial/Makefile
--- /home/ldoolitt/cvs/busybox/Makefile	Mon Apr 30 11:57:23 2001
+++ busybox-trial/Makefile	Mon Apr 30 12:30:46 2001
@@ -273,8 +273,8 @@
 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)) > $@
+applet_source_list: busybox.sh Config.h sh.c
+	(echo -n "APPLET_SOURCES := "; BB_SRC_DIR=$(BB_SRC_DIR) $(SHELL) $^) > $@
 
 doc: olddoc
 
diff -urN /home/ldoolitt/cvs/busybox/busybox.sh busybox-trial/busybox.sh
--- /home/ldoolitt/cvs/busybox/busybox.sh	Thu Mar  8 15:20:44 2001
+++ busybox-trial/busybox.sh	Mon Apr 30 12:26:37 2001
@@ -9,7 +9,7 @@
     | 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' ' '





More information about the busybox mailing list