- Add OMIT_MANUAL variable, which can be set to 1 to drop the install

manual from small CDs to save space. We will probably be adding several
      new translations, and possibly PDFs, and that would use too much space
      on the small CDs.
    - Also make the README link to the manual on the Debian web site if
      OMIT_MANUAL=1.
    - Update the README to mention manual translations are available.

CONF.sh

@@ -43,6 +43,7 @@ unset INSTALLER_CD      || true
 unset DI_CODENAME       || true
 unset MAXCDS            || true
 unset SPLASHPNG         || true
+unset OMIT_MANUAL	|| true
 
 # The debian-cd dir
 # Where I am (hoping I'm in the debian-cd dir)
@@ -283,3 +284,7 @@ export PUBLISH_PATH="/home/jigdo-area/"
 # in the Makefile. Use bin-official_images to build only binary CDs. The
 # default, official_images, builds everything.
 #IMAGETARGET=official_images
+
+# Set to 1 to save space by omitting the installation manual. 
+# If so the README will link to the manual on the web site.
+#export OMIT_MANUAL=1

Makefile

@@ -691,11 +691,13 @@ $(SDIR)/CD1/README.html:
 			$$dir/README.pgp $$dir/README.mirrors.txt \
 			$$dir/README.mirrors.html $$dir/README.non-US; \
 		cpp -traditional -undef -P -C -Wall -nostdinc -I $$dir/ \
+		    -D OMIT_MANUAL="$(OMIT_MANUAL)" \
 		    -D OUTPUTtext $(BASEDIR)/data/$(CODENAME)/README.html.in \
 			| sed -e 's/%%.//g' > $$dir/README.html ; \
 		lynx -dump -force_html $$dir/README.html | todos \
 			> $$dir/README.txt ; \
 		cpp -traditional -undef -P -C -Wall -nostdinc -I $$dir/ \
+		    -D OMIT_MANUAL="$(OMIT_MANUAL)" \
 		    -D OUTPUThtml $(BASEDIR)/data/$(CODENAME)/README.html.in \
 			| sed -e 's/%%.//g' > $$dir/README.html ; \
 		rm -f $$dir/README.diskdefines ; \

data/sarge/README.html.in

@@ -338,12 +338,21 @@ Installing
  Because Debian is a complete Operating System, the installation procedure
  may seem a bit unusual. You can install Debian GNU/Linux either
  <i>next to</i> your current OS, or as <i>only</i> OS on your computer.
-
+#if OMIT_MANUAL
+ <P>
+ Read the <i>Installation Manual</i>
+ <A href="http://www.nl.debian.org/releases/sarge/installmanual">on the Debian web site</a>.
+#else
  <P>
  Read the <i>Installation Manual</i>, on this CD at
  <P>
  <tt>&nbsp;
- <A href="doc/install/manual/en/index.html">doc/install/manual/en/index.html</a> &nbsp;&nbsp;&nbsp; </tt>
+ <A href="doc/install/manual/en/index.html">doc/install/manual/en/index.html</a> &nbsp;&nbsp;&nbsp; (English version)</tt>
+ <P>
+ Translations of the Installation Manual are also available in the
+ <tt><A href="doc/install">doc/install/</a></tt>
+ directory, along with various other documents.
+#endif
  <P>
  Programs and other files that are needed for the installation can be found on
  this CD under

debian/changelog

@@ -86,6 +86,13 @@ debian-cd (2.2.21) unstable; urgency=low
     - Exclude more new kernel images from CD1.
     - Stop hardcoding sid as the distribution to take the installation manual
       from, use DI_CODENAME instead.
+    - Add OMIT_MANUAL variable, which can be set to 1 to drop the install
+      manual from small CDs to save space. We will probably be adding several
+      new translations, and possibly PDFs, and that would use too much space
+      on the small CDs.
+    - Also make the README link to the manual on the Debian web site if
+      OMIT_MANUAL=1.
+    - Update the README to mention manual translations are available.
   * Bdale Garbee
     - update tasks and tools to make 2.6.8 kernels primary on hppa
     - add ramdisk_size=16384 to palo call in post-boot-hppa 

tools/add-bin-doc

@@ -25,6 +25,7 @@ for i in $BDIR/*.packages; do
 		$dir/README.pgp $dir/README.non-US ; \
 
 	cpp -traditional -undef -P -C -Wall -nostdinc -I$dir \
+	    -D OMIT_MANUAL="$OMIT_MANUAL" \
 	    -D OUTPUTtext $BASEDIR/data/$CODENAME/README.html.in \
 		| sed -e 's/%%.//g' > $dir/README.html
 
@@ -32,6 +33,7 @@ for i in $BDIR/*.packages; do
 	> $dir/README.txt ; \
 
 	cpp -traditional -undef -P -C -Wall -nostdinc -I $dir/ \
+	    -D OMIT_MANUAL="$OMIT_MANUAL" \
 	    -D OUTPUThtml $BASEDIR/data/$CODENAME/README.html.in \
 		| sed -e 's/%%.//g' > $dir/README.html
 

tools/sarge/installtools.sh

@@ -1,27 +1,29 @@
 #!/bin/bash
-
 # Install files in /install and some in /doc
+
 set -e
 
 # The location of the tree for CD#1, passed in
 DIR=$1
 
-DOCDIR=doc
+if [ "$OMIT_MANUAL" != 1 ]; then
+	DOCDIR=doc
 
-if [ -n "$BOOTDISKS" -a -e $BOOTDISKS/current/$DOCDIR ] ; then
-        DOCS=$BOOTDISKS/current/$DOCDIR
-else
-        echo "WARNING: Using $DI_CODENAME bootdisk documentation"
-        DOCS=$MIRROR/dists/$DI_CODENAME/main/installer-$ARCH/current/$DOCDIR
-fi
+	if [ -n "$BOOTDISKS" -a -e $BOOTDISKS/current/$DOCDIR ] ; then
+	        DOCS=$BOOTDISKS/current/$DOCDIR
+	else
+	        echo "WARNING: Using $DI_CODENAME bootdisk documentation"
+	        DOCS=$MIRROR/dists/$DI_CODENAME/main/installer-$ARCH/current/$DOCDIR
+	fi
 
-# 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/$DOCDIR/install
-if ! cp -a * $DIR/$DOCDIR/install; then
-    echo "ERROR: Unable to copy installer documentation to CD."
+	# 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/$DOCDIR/install
+	if ! cp -a * $DIR/$DOCDIR/install; then
+	    echo "ERROR: Unable to copy installer documentation to CD."
+	fi
 fi