Major rework of the directory structure and the entire build system.

 -Erik

5 files changed, 20 insertions, 24 deletions

diff --git a/docs/autodocifier.pl b/docs/autodocifier.pl
index d753300c1..3016e4022 100755
--- a/docs/autodocifier.pl
+++ b/docs/autodocifier.pl
@@ -251,7 +251,7 @@ a command.  I<REQUIRED>
 =item B<full>
 
 This should contain descriptions of each option.  This will also
-be displayed along with the trivial help if BB_FEATURE_TRIVIAL_HELP
+be displayed along with the trivial help if CONFIG_FEATURE_TRIVIAL_HELP
 is disabled.  I<REQUIRED>
 
 =item B<notes>
@@ -284,4 +284,4 @@ John BEPPU <beppu@lineo.com>
 
 =cut
 
-# $Id: autodocifier.pl,v 1.21 2001/04/17 17:09:34 beppu Exp $
+# $Id: autodocifier.pl,v 1.22 2001/10/24 04:59:20 andersen Exp $
diff --git a/docs/busybox.net/index.html b/docs/busybox.net/index.html
index b396b4b16..a0b4e6ccf 100644
--- a/docs/busybox.net/index.html
+++ b/docs/busybox.net/index.html
@@ -295,7 +295,6 @@ listed in the order I happen to add them to the web page:
 
 <ul>
     <li> <a href="http://cvs.debian.org/boot-floppies/">Debian installer (boot floppies) project</a>
-    <li> <a href="ftp://ftp.slackware.com/pub/slackware/slackware-8.0/source/rootdsks/">Slackware 8.0 installer</a>
     <li> <a href="http://www.linuxrouter.org/">Linux Router Project </a>
     <li> <a href="http://linux-embedded.org/">LEM</a>
     <li> <a href="http://www.toms.net/rb/">tomsrtbt</a>
@@ -325,7 +324,7 @@ listed in the order I happen to add them to the web page:
     <li> <a href="http://dutnux.sourceforge.net/">DutNux</a>
     <li> <a href="http://www.cachier.com/">Cachier</a>
     <li> <a href="http://www.microwerks.net/~hugo/mindi/">Mindi</a>
-    <li> <a href="http://www.tzi.de/~pharao90/ttylinux/">ttylinux</a>
+
 </ul>
 
 <p> Do you use BusyBox?  I'd love to know about it and I'd be happy to link to
diff --git a/docs/busybox.net/oldnews.html b/docs/busybox.net/oldnews.html
index d97bb2684..08a49caf8 100644
--- a/docs/busybox.net/oldnews.html
+++ b/docs/busybox.net/oldnews.html
@@ -74,12 +74,12 @@
     <li> <b>Busybox Boot-Floppy Image</b>
 
     <p>Because you asked for it, we have made available a <a href=
-    "ftp://opensource.lineo.com/busybox/busybox.floppy.img"> Busybox boot floppy
+    "ftp://oss.lineo.com/busybox/busybox.floppy.img"> Busybox boot floppy
     image</a>. Here's how you use it:
 
     <ol>
 
-            <li> <a href= "ftp://opensource.lineo.com/busybox/busybox.floppy.img">
+            <li> <a href= "ftp://oss.lineo.com/busybox/busybox.floppy.img">
             Download the image</a>
 
             <li> dd it onto a floppy like so: <tt> dd if=busybox.floppy.img
@@ -203,13 +203,13 @@
              details).
              <p>
              Also, some exciting infrastructure news!  Busybox now has its own 
-             <a href="http://opensource.lineo.com/lists/busybox/">mailing list</a>, 
+             <a href="http://oss.lineo.com/lists/busybox/">mailing list</a>, 
              publically browsable
-             <a href="http://opensource.lineo.com/cgi-bin/cvsweb/busybox/">CVS tree</a>,  
+             <a href="http://oss.lineo.com/cgi-bin/cvsweb/busybox/">CVS tree</a>,  
              anonymous
-             <a href="http://opensource.lineo.com/cvs_anon.html">CVS access</a>, and
+             <a href="http://oss.lineo.com/cvs_anon.html">CVS access</a>, and
              for those that are actively contributing there is even 
-             <a href="http://opensource.lineo.com/cvs_write.html">CVS write access</a>.
+             <a href="http://oss.lineo.com/cvs_write.html">CVS write access</a>.
              I think this will be a huge help to the ongoing development of BusyBox.
              <p>
              Also, for the curious, there is no 0.44 release.  Somehow 0.44 got announced
@@ -398,13 +398,10 @@
     Freshmeat AppIndex record for BusyBox</A>
     <p>
 
-    <li> <a href="http://opensource.lineo.com/software.html">Other cool embedded software</a>.
+    <li> <a href="http://oss.lineo.com/software.html">Cool embedded software</a>.
     <p>
 
-    <li> <a href="http://opensource.lineo.com/">opensource.lineo.com</a>.
-    <p>
-
-    <li> <A HREF="http://www.lineo.com/">Lineo</A> is sponsoring BusyBox development.
+    <li> <a href="http://oss.lineo.com/">oss.lineo.com</a>.
     <p>
 
 </ul>
@@ -425,8 +422,8 @@
         <TD>
             <font size="-1" face="arial, helvetica, sans-serif">
             Mail all comments, insults, suggestions and bribes to 
-            <a href="mailto:andersen@lineo.com">Erik Andersen</a><BR>
-            The Busybox logo is copyright 1999,2000, Erik Andersen.
+            <a href="mailto:andersen@codepoet.org">Erik Andersen</a><BR>
+            The Busybox logo is copyright 1999,2000,2001 Erik Andersen.
             </font>
         </TD>
 
diff --git a/docs/new-applet-HOWTO.txt b/docs/new-applet-HOWTO.txt
index 1f5c3ebd5..a00dfcc30 100644
--- a/docs/new-applet-HOWTO.txt
+++ b/docs/new-applet-HOWTO.txt
@@ -109,7 +109,7 @@ order, or else it will break the binary-search lookup algorithm in busybox.c
 and the Gods of BusyBox smite you. Yea, verily:
 
         /* all programs above here are alphabetically "less than" 'mu' */
-        #ifdef BB_MU
+        #ifdef CONFIG_MU
                 APPLET("mu", mu_main, _BB_DIR_USR_BIN, mu_usage)
         #endif
         /* all programs below here are alphabetically "greater than" 'mu' */
@@ -117,7 +117,7 @@ and the Gods of BusyBox smite you. Yea, verily:
 
 Finally, add a define for your applet to Config.h:
 
-        #define BB_MU
+        #define CONFIG_MU
 
 
 Documentation
diff --git a/docs/style-guide.txt b/docs/style-guide.txt
index c71f1e609..25c676ca2 100644
--- a/docs/style-guide.txt
+++ b/docs/style-guide.txt
@@ -252,7 +252,7 @@ files, you can do the following in the busybox directory:
 If you want to convert all the non-K&R vars in your file all at once, follow
 these steps:
 
- - In the busybox directory type 'scripts/mk2knr.pl files-to-convert'. This
+ - In the busybox directory type 'examples/mk2knr.pl files-to-convert'. This
    does not do the actual conversion, rather, it generates a script called
    'convertme.pl' that shows what will be converted, giving you a chance to
    review the changes beforehand.
@@ -269,7 +269,7 @@ these steps:
  
 Please be aware of changes that have cascading effects into other files. For
 example, if you're changing the name of something in, say utility.c, you
-should probably run 'scripts/mk2knr.pl utility.c' at first, but when you run
+should probably run 'examples/mk2knr.pl utility.c' at first, but when you run
 the 'convertme.pl' script you should run it on _all_ files like so:
 './convertme.pl *.[ch]'.
 
@@ -343,7 +343,7 @@ used in the code.
                 ret = my_func(bar, baz);
                 if (!ret)
                         return -1;
-                #ifdef BB_FEATURE_FUNKY
+                #ifdef CONFIG_FEATURE_FUNKY
                         maybe_do_funky_stuff(bar, baz);
                 #endif
 
@@ -351,7 +351,7 @@ used in the code.
 
         (in .h header file)
 
-                #ifdef BB_FEATURE_FUNKY
+                #ifdef CONFIG_FEATURE_FUNKY
                 static inline void maybe_do_funky_stuff (int bar, int baz)
                 {
                         /* lotsa code in here */
@@ -487,7 +487,7 @@ very limited stack space (e.g., uCLinux).
 A macro is declared in busybox.h that implements compile-time selection
 between xmalloc() and stack creation, so you can code the line in question as
 
-                RESERVE_BB_BUFFER(buffer, BUFSIZ);
+                RESERVE_CONFIG_BUFFER(buffer, BUFSIZ);
 
 and the right thing will happen, based on your configuration.