Stuf

4 files changed, 7 insertions, 5 deletions

diff --git a/Changelog b/Changelog
index 27ee085c1..1a7fd715e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,9 @@
 0.37
 	* Fixed 'make install' so symlinks are installed in their proper locations.
-	* Changed the build system slightly so that features can now be enables
-	    or disabled from the busybox.defs.h header file, which is much more sane.
+	* Changed the build system slightly so that features can now be enabled
+	    or disabled from the busybox.defs.h header file, without trying to 
+	    compile in a source file named after that featue (unless that file exists).
+	* Several options are now moved into busybox.defs.h
 	* Now 'rm -R' and 'rm -r' both work.
 	* dd now properly handles input beyond 1 block from stdin.
 
diff --git a/applets/install.sh b/applets/install.sh
index 9721102a1..4c2a4f1b8 100755
--- a/applets/install.sh
+++ b/applets/install.sh
@@ -10,10 +10,10 @@ fi
 h=`sort busybox.links | uniq`
 
 for i in $h ; do
-	echo "Symlinking $i to /bin/busybox"
 	mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `;
 	myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `;
 	mkdir -p $1$mypath
+	echo "  $1$mypath$myapp -> /bin/busybox"
 	(cd $1$mypath ; rm -f $1$mypath$myapp ; ln -s /bin/busybox $1$mypath$myapp )
 done
 rm -f $1/bin/busybox
diff --git a/busybox.def.h b/busybox.def.h
index a48deeca9..77ab4b567 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -74,7 +74,7 @@
 //
 //Enable init being called as /linuxrc
 #define BB_FEATURE_LINUXRC
-// Use termios to manipulate the screen (more is much pretties with this on)
+// Use termios to manipulate the screen ('more' is prettier with this on)
 #define BB_FEATURE_USE_TERMIOS
 // calculate terminal & column widths
 #define BB_FEATURE_AUTOWIDTH
diff --git a/install.sh b/install.sh
index 9721102a1..4c2a4f1b8 100755
--- a/install.sh
+++ b/install.sh
@@ -10,10 +10,10 @@ fi
 h=`sort busybox.links | uniq`
 
 for i in $h ; do
-	echo "Symlinking $i to /bin/busybox"
 	mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `;
 	myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `;
 	mkdir -p $1$mypath
+	echo "  $1$mypath$myapp -> /bin/busybox"
 	(cd $1$mypath ; rm -f $1$mypath$myapp ; ln -s /bin/busybox $1$mypath$myapp )
 done
 rm -f $1/bin/busybox