Index: general/prog/gcc/gcc-inst.xml
===================================================================
--- general/prog/gcc/gcc-inst.xml	(revision 1bf950c27754b9299f075c851330c76dcfeef91b)
+++ general/prog/gcc/gcc-inst.xml	(revision a40092ca7201f22c0a9540002074cfa8e197b782)
@@ -21,5 +21,5 @@
 make gnatlib_and_tools &amp;&amp;
 cd .. &amp;&amp;
-make install &amp;&amp;
+make install-no-fixedincludes &amp;&amp;
 export PATH=$PATH_HOLD</userinput></screen></para>
 
Index: general/prog/gcc/gcc-inst1.xml
===================================================================
--- general/prog/gcc/gcc-inst1.xml	(revision 1bf950c27754b9299f075c851330c76dcfeef91b)
+++ general/prog/gcc/gcc-inst1.xml	(revision a40092ca7201f22c0a9540002074cfa8e197b782)
@@ -12,5 +12,5 @@
 --with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu &amp;&amp;
 make bootstrap &amp;&amp;
-make install</userinput></screen></para>
+make install-no-fixedincludes</userinput></screen></para>
 
 </sect2>
Index: general/prog/jdk/compiled-j2sdk-config.xml
===================================================================
--- general/prog/jdk/compiled-j2sdk-config.xml	(revision 1bf950c27754b9299f075c851330c76dcfeef91b)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<sect2>
-<title>Configuring j2sdk</title>
-
-<sect3><title>Config files</title>
-<para><userinput>/etc/profile, ~/.bash_profile, ~/.profile, ~/.bashrc</userinput></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para>Add the following lines to the appropriate file listed
-above.</para>
-
-<para><screen><userinput>export JAVA_HOME=/opt/java/j2sdk
-export PATH=$PATH:$JAVA_HOME/bin</userinput></screen></para>
-
-</sect3>
-
-
-</sect2>
-
Index: general/prog/jdk/compiled-j2sdk-exp.xml
===================================================================
--- general/prog/jdk/compiled-j2sdk-exp.xml	(revision 1bf950c27754b9299f075c851330c76dcfeef91b)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>export JAVA_HOME=$PWD/j2sdk&j2sdk-version; :</userinput>
-This command sets the location of the working java.</para>
-
-<para><userinput>export ALT_BOOTDIR="$JAVA_HOME" :</userinput> This
-command set the compiler variable that will execute the java compiler
-when needed during make.</para>
-
-<para><userinput>export ALT_MOTIF_DIR=$SRC :</userinput> This sets the
-variable that points to where you unzipped the motif headers.</para>
-
-<para><userinput>export ALT_MOZILLA_PATH=$SRC :</userinput> This sets the
-variable that points to where you unzipped the mozilla headers.</para>
-
-<para><userinput>export ALT_DEVTOOLS_PATH="/usr/bin" :</userinput> This
-changes the default to the correct value.</para>
-
-<para><userinput>export ALT_MILESTONE="blfscompiled" :</userinput> This
-will help you identify this compiled version of java by appending this
-to the version in the output to "java -version".</para>
-
-<para><userinput>export BUILD_NUMBER=`date +%s` :</userinput> This will
-help you identify this compiled version of the runtime environment and
-virtual machine by appending this information to the version in the
-output to "java -version".</para>
-
-<para><userinput>export DEV_ONLY=true :</userinput> This command
-eliminates compiling the documentation and eliminates a dependency for
-rpm. </para>
-
-<para><userinput>export OTHER_LDFLAGS="-lpthread" :</userinput> This
-command corrects compiling errors related to the pthread variables. </para>
-
-<para><userinput>unset JAVA_HOME :</userinput> This clears the JAVA_HOME
-variable and prevents misdirection during compile.</para>
-
-<para><userinput>unset CLASSPATH :</userinput> This clears the CLASSPATH
-variable and prevents misdirection during compile.</para>
-
-<para><userinput>export OTHER_CFLAGS=${CFLAGS} :</userinput> This makes
-j2sdk compile using your CFLAGS for optimizations.</para>
-
-<para><userinput>export OTHER_CXXFLAGS=${CXXFLAGS} :</userinput> This
-makes j2sdk compile using your CXXFLAGS for optimizations.</para>
-
-<para><userinput>unset CFLAGS :</userinput> Now that the optimizations
-are loaded, this clears the variable.</para>
-
-<para><userinput>unset CXXFLAGS :</userinput> Now that the optimizations
-are loaded, this clears the variable.</para>
-
-
-</sect2>
-
Index: general/prog/jdk/compiled-j2sdk-inst.xml
===================================================================
--- general/prog/jdk/compiled-j2sdk-inst.xml	(revision 1bf950c27754b9299f075c851330c76dcfeef91b)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<sect2>
-<title>Installation of j2sdk</title>
-
-<para>To install j2sdk, you need to download the following files into
-your source directory:</para>
-<screen>From the download location (registration required)
-j2sdk-&cj2sdk-version;-src-scsl.zip
-j2sdk-&cj2sdk-version;-motif-linux-i386.zip
-j2sdk-&cj2sdk-version;-mozilla_headers-unix.zip
-From <ulink url="&ffile-root;"/>
-j2sdk-gcc31.patch</screen>
-
-<para>You should be in the java directory under your source
-directory.  Verifiy that environment is set as described in the
-configuration section of the binary installation.  If not:</para>
-
-<screen><userinput>export JAVA_HOME=$PWD/j2sdk&j2sdk-version;
-export PATH=$PATH:$JAVA_HOME/bin</userinput></screen>
-
-<para>Unzip and set the install of j2sdk by running the following commands:</para>
-
-<para><screen><userinput>for i in ../j2sdk-1_4_0-*.zip; do unzip $i; done &amp;&amp;
-patch -Np1 -i ../j2sdk-gcc31.patch &amp;&amp;
-export SRC=$PWD &amp;&amp;
-export ALT_BOOTDIR="$JAVA_HOME" &amp;&amp;
-export ALT_MOTIF_DIR=$SRC &amp;&amp;
-export ALT_MOZILLA_PATH=$SRC &amp;&amp;
-export ALT_DEVTOOLS_PATH="/usr/bin" &amp;&amp;
-export MILESTONE="blfscompiled" &amp;&amp;
-export BUILD_NUMBER=`date +%s` &amp;&amp;
-export DEV_ONLY=true &amp;&amp;
-export OTHER_LDFLAGS="-lpthread" &amp;&amp;
-unset JAVA_HOME &amp;&amp;
-unset CLASSPATH &amp;&amp;
-export OTHER_CFLAGS=${CFLAGS} &amp;&amp;
-export OTHER_CXXFLAGS=${CXXFLAGS} &amp;&amp;
-unset CFLAGS &amp;&amp;
-unset CXXFLAGS</userinput></screen></para>
-
-<para>Make will not find cpio unless it is in the
-<filename>/usr</filename> directory. Create this link with the following
-command:</para>
-
-<para><screen><userinput>ln -s /usr/bin/cpio /bin/cpio</userinput></screen></para> 
-
-<para>Make and Install j2sdk with the following commands:</para>
-
-<para><screen><userinput>cd $SRC/control/make &amp;&amp;
-make &amp;&amp;
-cd $SRC/control/build/linux-i386 &amp;&amp;
-mkdir -p /opt/java &amp;&amp;
-cp -a j2sdk-image /opt/java/j2sdk-&cj2sdk-version; &amp;&amp;
-cd /opt/java &amp;&amp;
-ln -s j2sdk-&cj2sdk-version; j2sdk</userinput></screen></para>
-
-<para>Test the installation with the following commands:</para>
-
-<para><screen><userinput>export JAVA_HOME=/opt/java/j2sdk  &amp;&amp;
-$JAVA_HOME/jre/bin/java -version</userinput></screen></para>
-
-<para>If you get a version line, a description of the runtime
-environment and a desrciption of the client VM (virtual machine), you are ready
-to go.</para>
-</sect2>
-
Index: general/prog/jdk/compiled-j2sdk-intro.xml
===================================================================
--- general/prog/jdk/compiled-j2sdk-intro.xml	(revision 1bf950c27754b9299f075c851330c76dcfeef91b)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<sect2>
-<title>Introduction to j2sdk</title>
-
-<screen>Download location (HTTP):       <ulink url="&cj2sdk-download-http;"/>
-Download location (FTP):        <ulink url="&cj2sdk-download-ftp;"/>
-Version used:                   &cj2sdk-version;
-Package size:                   &cj2sdk-size;
-Estimated Disk space required:  &cj2sdk-buildsize;</screen>
-
-<para>The j2sdk package contains Sun's java development environment.
-This is useful for developing java programs and provides the runtime
-environment necessary to run java programs.  It also includes a plug-in
-for browsers so that they can be java aware.</para>
-
-<para>If you have difficulties in building the jdk, check out the javafromscratch
-hint for detailed information at <ulink url="http://www.linuxfromscratch.org/~tushar/"/>.
-Individual patches are also available at the same location.</para>
-
-<screen>j2sdk depends on:
-<xref linkend="xfree86"/>, <xref linkend="zip"/>, <xref linkend="unzip"/>, <xref linkend="cpio"/>, <xref linkend="tcsh"/> and <xref linkend="j2sdk"/></screen>
-
-</sect2>
Index: general/prog/jdk/j2sdk-exp.xml
===================================================================
--- general/prog/jdk/j2sdk-exp.xml	(revision 1bf950c27754b9299f075c851330c76dcfeef91b)
+++ general/prog/jdk/j2sdk-exp.xml	(revision a40092ca7201f22c0a9540002074cfa8e197b782)
@@ -37,5 +37,5 @@
 are insane the build will not proceed. The certified platform for the build is
 Redhat 6.1. The above variable ensures that all the errors related to
-compiling on a non-certifiedi platform will be converted to warnings.</para>
+compiling on a non-certified platform will be converted to warnings.</para>
 
 <para><userinput>export MAKE_VERBOSE=true:</userinput> Allows the current
Index: general/prog/jdk/j2sdk-inst.xml
===================================================================
--- general/prog/jdk/j2sdk-inst.xml	(revision 1bf950c27754b9299f075c851330c76dcfeef91b)
+++ general/prog/jdk/j2sdk-inst.xml	(revision a40092ca7201f22c0a9540002074cfa8e197b782)
@@ -8,5 +8,5 @@
 
 <para><screen><userinput>
-VERSION=&j2sdk-bin-version &amp;&amp;
+VERSION=&j2sdk-bin-version; &amp;&amp;
 MV=`echo $VERSION | cut -d "_" -f 1,1` &amp;&amp;
 V=`echo ${VERSION} | sed -e "s/\./_/g"` &amp;&amp;
@@ -32,5 +32,5 @@
 
 <para><screen><userinput>
-VERSION=&j2sdk-src-version &amp;&amp;
+VERSION=&j2sdk-src-version; &amp;&amp;
 V=`echo $VERSION | sed -e "s/\./_/g"` &amp;&amp;
 unzip j2sdk-${V}-src-scsl.zip &amp;&amp;
