Stuf

diff --git a/Changelog b/Changelog
index 27ee085c1d3164b963770a49b4918ecea7e7a0cc..1a7fd715e41b370409b55c6966415b7daf572e90 100644 (file)
--- 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 9721102a1a67c16b581f9834dfa06a24d30d60d9..4c2a4f1b800e1cb15b295eb7d21e57168256abd7 100755 (executable)
--- 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 a48deeca9d00e6b6e7d94f2e48757c1a98ac7ae7..77ab4b567f4a16bb5624eae3c1322ec68e43b96c 100644 (file)
--- 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 9721102a1a67c16b581f9834dfa06a24d30d60d9..4c2a4f1b800e1cb15b295eb7d21e57168256abd7 100755 (executable)
--- 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