Change the default path to icons so that "mkhowto" does the "right thing" by
default when used for 3rd-party docs. This requires the standard Python docs
to specify a location, but they are a bit of a special case in sharing one set
of icons among several documents.
diff --git a/Doc/Makefile b/Doc/Makefile
index f76238a..2b8b9e0 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -73,10 +73,12 @@
MKDVI= $(PYTHON) ../tools/mkhowto --paper=$(PAPER) --dvi
MKHTML= $(PYTHON) tools/mkhowto --html --about html/stdabout.dat \
+ --iconserver ../icons \
--address $(PYTHONDOCS) --up-link ../index.html \
--up-title "Python Documentation Index" \
--global-module-index "../modindex.html" --dvips-safe
MKISILOHTML=$(PYTHON) tools/mkhowto --html --about html/stdabout.dat \
+ --iconserver ../icons \
--l2h-init perl/isilo.perl --numeric --split 1 \
--dvips-safe
MKISILO= iSilo386 -U -y -rCR -d0
diff --git a/Doc/perl/l2hinit.perl b/Doc/perl/l2hinit.perl
index ab00b50..7835cb5 100644
--- a/Doc/perl/l2hinit.perl
+++ b/Doc/perl/l2hinit.perl
@@ -17,7 +17,7 @@
#
$SHOW_SECTION_NUMBERS = 1;
-$ICONSERVER = '../icons';
+$ICONSERVER = '.';
$IMAGE_TYPE = 'gif';
# Control where the navigation bars should show up:
diff --git a/Doc/tools/mkhowto b/Doc/tools/mkhowto
index 322b6ba..d2ff646 100755
--- a/Doc/tools/mkhowto
+++ b/Doc/tools/mkhowto
@@ -15,7 +15,7 @@
--address, -a Specify an address for page footers.
--link Specify the number of levels to include on each page.
--split, -s Specify a section level for page splitting, default: %(max_split_depth)s.
- --iconserver, -i Specify location of icons (default: ../).
+ --iconserver, -i Specify location of icons (default: ./).
--image-type Specify the image type to use in HTML output;
values: gif (default), png.
--numeric Don't rename the HTML files; just keep node#.html for
@@ -93,7 +93,7 @@
debugging = 0
discard_temps = 1
have_temps = 0
- icon_server = None
+ icon_server = "."
image_type = "gif"
logging = 0
max_link_depth = 3