* cherry-picked patches from apt--fixes and apt--mvo

[apt.git] / README.make

diff --git a/README.make b/README.make
index 1d87c02cb3a459bfc0dd526ffb2baa6e37a07be5..c043f10f6792b676cbc22a17196ab6f9bc5053e4 100644 (file)
--- a/README.make
+++ b/README.make
@@ -26,12 +26,12 @@ and configure substitutions across build makefiles is not used at all.
 
 Furthermore, the make system runs with a current directory equal to the
 source directory irregardless of the destination directory. This means
 
 Furthermore, the make system runs with a current directory equal to the
 source directory irregardless of the destination directory. This means

-#include "" and #include <> work as epected and more importantly
+#include "" and #include <> work as expected and more importantly

 running 'make' in the source directory will work as expected. The
 environment variable or make parameter 'BUILD' sets the build directory.
 It may be an absolute path or a path relative to the top level directory.
 running 'make' in the source directory will work as expected. The
 environment variable or make parameter 'BUILD' sets the build directory.
 It may be an absolute path or a path relative to the top level directory.

-By default build/ will be used with a fall back to ./ This means
-you can get all the advantages of a build directory without having to
+By default build-arch/ then build/ will be used with a fall back to ./ This 
+means you can get all the advantages of a build directory without having to

 cd into it to edit your source code!
 
 The make system also performs dependency generation on the fly as the
 cd into it to edit your source code!
 
 The make system also performs dependency generation on the fly as the


@@ -49,10 +49,8 @@ the source directory but is logically divided in the following manner
      examples/
    include/
      apt-pkg/
      examples/
    include/
      apt-pkg/

-     deity/

    obj/
      apt-pkg/
    obj/
      apt-pkg/

-     deity/

      cmndline/
      [...]
 Only .o and .d files are placed in the obj/ subdirectory. The final compiled
      cmndline/
      [...]
 Only .o and .d files are placed in the obj/ subdirectory. The final compiled


@@ -91,6 +89,7 @@ Straight out of CVS you have to initialize autoconf. This requires
 automake (I really don't know why) and autoconf and requires doing 
   aclocal -I buidlib
   autoconf
 automake (I really don't know why) and autoconf and requires doing 
   aclocal -I buidlib
   autoconf

+[Altertatively you can run make startup in the top level build dir]

 
 Autoconf is configured to do some basic system probes for optional and 
 required functionality and generate an environment.mak and include/config.h 
 
 Autoconf is configured to do some basic system probes for optional and 
 required functionality and generate an environment.mak and include/config.h 


@@ -110,4 +109,4 @@ There is one big warning, you can't use both this make file and the
 ones in the top level tree. Make is not able to resolve rules that 
 go to the same file through different paths and this will confuse the
 depends mechanism. I recommend always using the makefiles in the
 ones in the top level tree. Make is not able to resolve rules that 
 go to the same file through different paths and this will confuse the
 depends mechanism. I recommend always using the makefiles in the

-source directory and exporting BUILD
+source directory and exporting BUILD.