- Include sarge installation manual on sarge CDs.

- Remove install/doc, and just use doc/install.

data/sarge/README.html.in

@@ -342,7 +342,7 @@ Installing
  Read the <i>Installation Manual</i>, on this CD at
  <P>
  <tt>&nbsp;
- <A href="install/doc/index.en.html">/install/doc/index.en.html</a> &nbsp;&nbsp;&nbsp; </tt>
+ <A href="doc/install/manual/en/index.html">doc/install/manual/en/index.html</a> &nbsp;&nbsp;&nbsp; </tt>
  <P>
  Programs and other files that are needed for the installation can be found on
  this CD under

debian/changelog

@@ -2,6 +2,9 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
 
   * Remove debian-keyring.tar.gz from the doc dir.
   * Don't include Contents-$ARCH.gz on netinst/businesscard CD.
+  * Joey Hess
+    - Include sarge installation manual on sarge CDs.
+    - Remove install/doc, and just use doc/install.
 
  -- Raphael Hertzog <hertzog@debian.org>  Thu, 25 Mar 2004 07:33:23 +0100
 

tools/sarge/installtools.sh

@@ -15,28 +15,13 @@ else
         DOCS=$MIRROR/dists/sid/main/installer-$ARCH/current/$DOCDIR
 fi
 
-# Put the install documentation in /install
+# Put the install documentation in /doc/install
 if [ ! -d $DOCS ]; then
     echo "ERROR: Unable to copy installer documentation to CD."
     exit
 fi
 cd $DOCS
-mkdir -p $DIR/install/$DOCDIR
+mkdir -p $DIR/$DOCDIR/install
-if cp -a * $DIR/install/$DOCDIR/ ; then
+if ! cp -a * $DIR/$DOCDIR/install; then
-    ln -f $DIR/install/$DOCDIR/index.en.html $DIR/install/$DOCDIR/index.html
-else
     echo "ERROR: Unable to copy installer documentation to CD."
 fi
-
-# Put the installer documentation in /doc too
-mkdir -p $DIR/doc/install
-cd $DIR/doc/install
-for file in ../../install/$DOCDIR/*.html
-do
-    ln $file
-done
-if [ -e ../../install/$DOCDIR/INSTALLATION-HOWTO ]; then
-    ln -f ../../install/$DOCDIR/INSTALLATION-HOWTO
-fi
-
-# FIXME: why does it have to be in two places?