Index: openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver4.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver4.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver4.xml	14 Feb 2004 19:51:00 -0000	1.4
+++ openacs-4/packages/acs-core-docs/www/xml/install-guide/aolserver4.xml	17 Feb 2004 11:09:25 -0000	1.5
@@ -33,8 +33,7 @@
 tar xfz tcl8.4.5-src.tar.gz
 cd tcl8.4.5/unix
 ./configure --enable-threads
-make install
-</action>
+make install</action>
       </screen>
     </listitem>
     <listitem id="aolserver4-download">
@@ -43,8 +42,8 @@
         <para>Download the aolserver from CVS.</para>
       </formalpara>
       <screen>[root root]# <userinput>cd /usr/local/src</userinput>
-[root src]# <userinput>mkdir aolserver</userinput>
-[root src]# <userinput>cd aolserver</userinput>
+[root src]# <userinput>mkdir aolserver40r2</userinput>
+[root src]# <userinput>cd aolserver40r2</userinput>
 [root aolserver]# <userinput>cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/aolserver login</userinput>
 [root aolserver]# <userinput>cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/aolserver co  -r aolserver_v40_r2 aolserver</userinput>
 [root aolserver]# <userinput>cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/aolserver co nscache</userinput>
@@ -57,8 +56,8 @@
 [root aolserver]# <userinput>tar xvfz tDOM-0.7.8.tar.gz</userinput>
 [root root]# 
 <action>cd /usr/local/src
-mkdir aolserver
-cd aolserver
+mkdir aolserver40r2
+cd aolserver40r2
 cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/aolserver co -r aolserver_v40_r2 aolserver
 cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/aolserver co nscache
 cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/aolserver co nsrewrite
@@ -72,11 +71,17 @@
     <listitem id="aolserver4-install">
       <formalpara>
         <title>Configure, compile and install AOLserver</title>
-        <para><screen>[root aolserver]# <userinput>cd aolserver</userinput>
-[root aolserver]# <userinput>cd aolserver</userinput>
-[root aolserver]# <userinput>./configure --with-tcl=/usr/local/lib/</userinput>
-[root aolserver]# <userinput>make install</userinput></screen></para>
+        <para>Many people need to run more than one version of AOLserver in parallel.  This section accomodates future upgrades by installing AOLserver 4 in <computeroutput>/usr/local/aolserver40r2</computeroutput>.</para>
       </formalpara>
+        <screen>[root aolserver]# <userinput>cd /usr/local/src/aolserver40r2/aolserver</userinput>
+[root aolserver]# <userinput>./configure --prefix=/usr/local/aolserver40r2 --with-tcl=/usr/local/lib/</userinput>
+[root aolserver]# <userinput>make install</userinput>
+      <action>cd /usr/local/src/aolserver40r2/aolserver
+./configure --with-tcl=/usr/local/lib/
+make install
+ln -s /usr/local/aolserver40r2 /usr/local/aolserver</action></screen>
+      <para>If this is the only version of AOLserver in use, or is the default version, create a symlink.  If not, then be sure to use <computeroutput>/usr/local/aolserver40r2</computeroutput> instead of <computeroutput>/usr/local/aolserver</computeroutput> in future steps.</para>
+      <screen>[root aolserver]# <userinput>ln -s /usr/local/aolserver40r2 /usr/local/aolserver</userinput></screen>
     </listitem>
     <listitem id="aolserver4-modules-install">
       <formalpara>
@@ -85,33 +90,27 @@
           <orderedlist>
             <listitem id="aolserver4-nscache-install">
               <para>Install nscache</para>
-              <screen>[root /usr/local/src/aolserver/aolserver]# <userinput>cd ../nscache</userinput>
-[root /usr/local/src/aolserver/nscache]# <userinput>make install</userinput></screen>
+              <screen>[root aolserver]# <userinput>cd /usr/local/src/aolserver40r2/nscache</userinput>
+[root nscache]# <userinput>make install</userinput></screen>
             </listitem>
             <listitem id="aolserver4-nsrewrite-install">
               <para>Install nsrewrite</para>
-              <screen>[root /usr/local/src/aolserver/nscache]# <userinput>cd ../nsrewrite</userinput>
-[root /usr/local/src/aolserver/nsrewrite]# <userinput>make install</userinput></screen>
+              <screen>[root nscache]# <userinput>cd ../nsrewrite</userinput>
+[root nsrewrite]# <userinput>make install</userinput></screen>
             </listitem>
             <listitem id="aolserver4-nsoracle-install">
               <para>Install nsoracle (if you want to use Oracle)</para>
-              <screen>[root /usr/local/src/aolserver/nscache]# <userinput>cd ../nsoracle</userinput>
-[root /usr/local/src/aolserver/nsrewrite]# <userinput>make install</userinput></screen>
-              <para>Steps so far</para>
-              <screen><action>cd /usr/local/src/aolserver/
-./configure --with-tcl=/usr/local/lib/
-make install
-cd ../nscache
-make install
-cd ../nsrewrite
-make install
-cd ../nsoracle
-make install</action></screen>
+              <screen>[root nscache]# <userinput>cd ../nsoracle</userinput>
+[root nsoracle]# <userinput>make install</userinput></screen>
             </listitem>
             <listitem id="aolserver4-nspostgres-install">
               <para>Install nspostgres (if you want to use Postgres)</para>
               <screen>[root nsrewrite]# <userinput>cd ../nspostgres</userinput>
-[root nspostgres]# <userinput>make install POSTGRES=/usr/local/pgsql ACS=1 INST=/usr/local/aolserver </userinput></screen>
+[root nspostgres]# <userinput>make install POSTGRES=LSB ACS=1 INST=/usr/local/aolserver40r2 </userinput></screen>
+              <para>If you get errors like:</para>
+              <programlisting>nspostgres.c: In function `Ns_PgTableList':
+nspostgres.c:679: warning: passing arg 3 of `Tcl_DStringAppend' as signed due to prototype</programlisting>
+              <para>then PostGreSQL is probably not in the standard location.  The location of PostGreSQL is very dependent on which method was used to install it.  To correct the problem, replace <computeroutput>LSB</computeroutput> with the path to the path to your PostGreSQL installation.  Often this is <computeroutput>/usr/local/pgsql</computeroutput>.</para>
               <para>If you run into problems with libpq.a do the following (and repeat the step above)</para>
               <screen>[root nspostgres]# <userinput>ranlib /usr/local/pgsql/lib/libpq.a</userinput></screen>
               <para>If you run into problems with the linker, edit the Makefile. Add <computeroutput>-lnsdb</computeroutput> to the <computeroutput>MODLIBS</computeroutput> var.</para>
@@ -132,7 +131,7 @@
               <screen>[root nssha1]# <userinput>cd ../tDOM-0.7.8/unix</userinput></screen>
               <para>Edit the <computeroutput>CONFIG</computeroutput> file. Uncomment the instructions meant for AOLserver 4, but edit it to look like this:</para>
               <screen>../configure --enable-threads --disable-tdomalloc
-          --prefix=/usr/local/aolserver --with-tcl=/usr/local/lib</screen>
+          --prefix=/usr/local/aolserver40r2 --with-tcl=/usr/local/lib</screen>
               <para>Now you can compile and configure tDOM</para>
               <screen>[root unix]# <userinput>sh CONFIG</userinput>
 [root unix]# <userinput>make install</userinput></screen>
@@ -154,21 +153,21 @@
       <itemizedlist>
             <listitem>
               <para>Oracle</para>
-              <screen>[root aolserver]# <userinput>cd /usr/local/aolserver/bin</userinput>
+              <screen>[root aolserver]# <userinput>cd /usr/local/aolserver40r2/bin</userinput>
 [root bin]# <userinput>cp /tmp/&tarballpath;/packages/acs-core-docs/www/files/nsd-oracle.txt ./nsd-oracle</userinput>
 [root bin]# <userinput>chmod 750 nsd-oracle</userinput>
 [root bin]#
-<action>cd /usr/local/aolserver/bin
+<action>cd /usr/local/aolserver40r2/bin
 cp /tmp/&tarballpath;/packages/acs-core-docs/www/files/nsd-oracle.txt ./nsd-oracle
 chmod 750 nsd-oracle</action></screen>
             </listitem>
             <listitem>
               <para>PostgreSQL</para>
-              <screen>[root aolserver]# <userinput>cd /usr/local/aolserver/bin</userinput>
+              <screen>[root aolserver]# <userinput>cd /usr/local/aolserver40r2/bin</userinput>
 [root bin]# <userinput>cp /tmp/&tarballpath;/packages/acs-core-docs/www/files/nsd-postgres.txt ./nsd-postgres</userinput>
 [root bin]# <userinput>chmod 755 nsd-postgres</userinput>
 [root bin]#
-<action>cd /usr/local/aolserver/bin
+<action>cd /usr/local/aolserver40r2/bin
 cp /tmp/&tarballpath;/packages/acs-core-docs/www/files/nsd-postgres.txt ./nsd-postgres
 chmod 755 nsd-postgres</action></screen>
         </listitem>
@@ -184,6 +183,4 @@
     </listitem>
   </orderedlist>
   <para><phrase role="cvstag">($Id$)</phrase></para>
-</sect1>
-
-
+</sect1>
\ No newline at end of file