ChangeLogTag: Tue Feb 10 18:15:59 2004 Boris Kolpackov <boris@dre.vanderbilt.edu>

2 files changed, 16 insertions, 12 deletions

diff --git a/TAO/CIAO/CCF/Documentation/Build.html b/TAO/CIAO/CCF/Documentation/Build.html
index 79d2371c8de..fcf9cc18e6a 100644
--- a/TAO/CIAO/CCF/Documentation/Build.html
+++ b/TAO/CIAO/CCF/Documentation/Build.html
@@ -61,7 +61,6 @@ cvs-id    : $Id$
 
 <li><a href="#linux">Other GNU/Linux or UNIX Distributions</a>
 <ul>
-<li><a href="#linux_make">Make</a></li>
 <li><a href="#linux_cxx">C++</a></li>
 <li><a href="#linux_boost">Boost Libraries</a></li>
 <li><a href="#linux_utility">Utility Library</a></li>
@@ -87,7 +86,6 @@ cvs-id    : $Id$
 Debian package repository:
 
 <ol>
-<li><code>make-3.80-4</code> or better</li>
 <li><code>libboost-dev-1.30.2-2</code> or better</li>
 <li><code>libboost-regex-dev-1.30.2-2</code> or better</li>
 </ol>
@@ -107,7 +105,7 @@ $ dpkg -i libutility*.deb
 
 <p>Now you are ready to build CCF libraries:</p>
 <pre>$ cd $CIAO_ROOT/CCF/CCF
-$ make -f Makefile.alt
+$ make
 </pre>
 
 
@@ -120,9 +118,6 @@ $ make -f Makefile.alt
 
 <ol>
 
-<li><a href="http://www.dre.vanderbilt.edu/cidlc/prerequisites/rpm/make-3.80-1_patched_bbn.i386.rpm">
-<code>make-3.80-1_patched_bbn.i386.rpm</code></a></li>
-
 <li><a href="http://www.dre.vanderbilt.edu/cidlc/prerequisites/rpm/boost-devel-1.30.2-2.i386.rpm">
 <code>boost-devel-1.30.2-2.i386.rpm</code></a></li>
 
@@ -134,7 +129,6 @@ $ make -f Makefile.alt
 </code> then to install you can issue these commands:</p>
 
 <pre>$ cd /usr/src/redhat/RPMS/i386
-$ rpm -Uhv make-3.80-1_patched_bbn.i386.rpm
 $ rpm -Uhv boost-devel-1.30.2-2.i386.rpm
 $ rpm -Uhv Utility-1.2.2-3.i386.rpm
 </pre>
@@ -142,7 +136,7 @@ $ rpm -Uhv Utility-1.2.2-3.i386.rpm
 
 <p>Now you are ready to build CCF libraries:</p>
 <pre>$ cd $CIAO_ROOT/CCF/CCF
-$ make -f Makefile.alt
+$ make
 </pre>
 
 
@@ -151,6 +145,8 @@ $ make -f Makefile.alt
 
 <h1><a name="linux">Other GNU/Linux or UNIX Distributions</a></h1>
 
+<!--
+
 <h2><a name="linux_make">Make</a></h2>
 <p>Currently in order to build CCF Libraries you will need
 <a href="http://savannah.gnu.org/projects/make/">GNU make</a> 3.80 with the
@@ -174,6 +170,8 @@ fixes applied.
 just try building CCF and if you see some strange make-related errors then
 you will need to upgrade.</p>
 
+-->
+
 <h2><a name="linux_cxx">C++</a></h2>
 <p>You can use any standard-conformant C++ compiler.
 <a href="http://gcc.gnu.org">GNU G++</a> 3.3 is known to work.</p>
@@ -208,7 +206,7 @@ and <code>libboost_regex.a</code> into it.</p>
 <h2><a name="linux_utility">Utility Library</a></h2>
 
 <p>Another prerequisite for CCF is
-<a href="ftp://ftp.kolpackov.net/pub/Utility/Utility-1.2/Utility-1.2.2.tar.bz2">Utility
+<a href="http://www.dre.vanderbilt.edu/cidlc/prerequisites/Utility-1.2.2.tar.bz2">Utility
 Library</a>. You don't need to build anything in this library. Just unpack
 it to some convenient place.</p>
 
@@ -253,7 +251,7 @@ uninitialized.</p>
 <p>Finally, you can start the build process:</p>
 
 <pre>$ cd CCF/CCF
-$ make -f Makefile.alt</pre>
+$ make</pre>
 
 
 <!-- Windows -->
@@ -291,7 +289,7 @@ downloading unzip this file in <code>D:\lib</code> so that you get
 
 <li>Download the latest pre-built
 <a href="http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=72941">
-<code>boost-jam<code></a>. At the time of writing, the latest version was
+<code>boost-jam</code></a>. At the time of writing, the latest version was
 <code>3.1.7</code> thus the file you download would be
 <code>bjam-3.1.7-ntx86.zip</code>. Unzip this file in <code>D:\lib</code> so
 that you get <code>D:\lib\bin.ntx86\bjam.exe</code>.</li>
@@ -330,7 +328,7 @@ Instructions</a> if you have any questions.<p>
 <h2><a name="windows_utility">Utility Library</a></h2>
 
 <p>Another prerequisite for CCF is
-<a href="ftp://ftp.kolpackov.net/pub/Utility/Utility-1.2.2.tar.bz2">Utility
+<a href="http://www.dre.vanderbilt.edu/cidlc/prerequisites/Utility-1.2.2.tar.bz2">Utility
 Library</a>. You don't need to build anything in this library. Just unpack
 it to some convenient place and add it to your VC7.1 include directory search
 list. For example if you unpacked <code>Utility-1.2.2.tar.bz2</code> in
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 9d24e50ad09..c075e47c343 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 10 18:15:59 2004  Boris Kolpackov  <boris@dre.vanderbilt.edu>
+
+	* CCF/Documentation/Build.html:
+
+	  Fixed bugs and updated links.
+
 Tue Feb 10 16:44:33 2004  Tao Lu  <lu@dre.vanderbilt.edu>
 
 	* CIDLC/CIDLC.vcproj: