--- doc/HackersGuide.htex.orig	Sun Nov 12 06:24:51 2000
+++ doc/HackersGuide.htex	Sun Nov 12 06:24:47 2000
@@ -1,8 +1,8 @@
 %% LyX 1.1 created this file.  For more info, see http://www.lyx.org/.
 %% Do not edit unless you really know what you are doing.
 \documentclass[12pt,letterpaper,oneside]{book}
-\usepackage{palatino}
-\usepackage[T1]{fontenc}
+%% \usepackage{palatino}
+%% \usepackage[T1]{fontenc}
 
 \makeatletter
 
--- doc/Manual.htex.orig	Sun Nov 12 06:24:00 2000
+++ doc/Manual.htex	Sun Nov 12 06:25:02 2000
@@ -3,8 +3,8 @@
 
 %% Do not edit this file unless you know what you are doing.
 \documentclass[12pt,letterpaper,oneside]{book}
-\usepackage[T1]{fontenc}
-\usepackage{palatino}
+%% \usepackage[T1]{fontenc}
+%% \usepackage{palatino}
 
 \makeatletter
 
--- doc/Makefile.sub.orig	Sat Sep 30 12:10:13 2000
+++ doc/Makefile.sub	Thu Feb  1 12:44:15 2001
@@ -3,12 +3,14 @@
 
 include ../../makeopts
 
-all:	wxhelp.map
+all:	$(DIR)/wxhelp.map
 	@true
 
 #include ../../makerules
 
-wxhelp.map: ../.src/$(DIR).htex ../.src/html.sty
+HTML2WXHELP=	$(shell pwd)/../../.src/extra/scripts/html2wxhelp
+
+$(DIR)/wxhelp.map: ../.src/$(DIR).htex ../.src/html.sty
 	@ln -sf ../.src/$(DIR).htex ../.src/html.sty ../.src/pics .
 	../../.src/extra/scripts/striphelpids $(DIR).htex >tmp.tex
 	$(LATEX) tmp.tex </dev/null
@@ -21,11 +23,12 @@
 	mv tmp.dvi $(DIR).dvi
 	mv tmp.aux $(DIR).aux
 	rm -f tmp.*
-	@$(RM) -r $(DIR)
-	$(LATEX2HTML) -local_icons -debug $(DIR).htex
-	cd $(DIR) && ../../../.src/extra/scripts/html2wxhelp > ../wxhelp.map
+	$(LATEX2HTML) -mkdir -dir /tmp/$(DIR) -local_icons -debug $(DIR).htex
+	cd /tmp/$(DIR) && $(HTML2WXHELP) > wxhelp.map
+	@(cd /tmp; tar -cpf - ${DIR}) | tar -xf -
+	@${RM} -r /tmp/$(DIR)
 
-install: wxhelp.map
+install: $(DIR)/wxhelp.map
 	$(INSTALL_DATA) $(DIR).pdf $(DOCDIR)/Pdf
 	@$(RM) -r $(DOCDIR)/$(DIR)
 	$(INSTALL) -d $(DOCDIR)/$(DIR)