Cleaned up to install dvi, use native texi2dvi, etc..

9 files changed, 54 insertions, 45 deletions

diff --git a/doc/supplements/hppa1_1/Makefile b/doc/supplements/hppa1_1/Makefile
index b04cbd6c79..10c21d180a 100644
--- a/doc/supplements/hppa1_1/Makefile
+++ b/doc/supplements/hppa1_1/Makefile
@@ -33,24 +33,25 @@ info: dirs c_hppa1_1
 c_hppa1_1: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-dvi: $(PROJECT).dvi
+dvi: dirs $(PROJECT).dvi
 ps: dirs $(PROJECT).ps
 pdf: dirs $(PROJECT).pdf
 	
 $(PROJECT).pdf: $(FILES)
 	$(TEXI2PDF) $(PROJECT).texi
-	cp $(PROJECT).pdf $(PDF_INSTALL)
+	cp $(PROJECT).pdf $(WWW_INSTALL)/$(PROJECT)
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
+	cp $(PROJECT).ps $(WWW_INSTALL)/$(PROJECT)
 
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
+	cp $(PROJECT).dvi $(WWW_INSTALL)/$(PROJECT)
 
 html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
+	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
+	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
 
 clean:
diff --git a/doc/supplements/i386/Makefile b/doc/supplements/i386/Makefile
index 67a1cb64c0..18d2899b93 100644
--- a/doc/supplements/i386/Makefile
+++ b/doc/supplements/i386/Makefile
@@ -35,24 +35,25 @@ info: dirs c_i386
 c_i386: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-dvi: $(PROJECT).dvi
+dvi: dirs $(PROJECT).dvi
 ps: dirs $(PROJECT).ps
 pdf: dirs $(PROJECT).pdf
 	
 $(PROJECT).pdf: $(FILES)
 	$(TEXI2PDF) $(PROJECT).texi
-	cp $(PROJECT).pdf $(PDF_INSTALL)
+	cp $(PROJECT).pdf $(WWW_INSTALL)/$(PROJECT)
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
+	cp $(PROJECT).ps $(WWW_INSTALL)/$(PROJECT)
 
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
+	cp $(PROJECT).dvi $(WWW_INSTALL)/$(PROJECT)
 
 html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_i386
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
+	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
+	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
 
 clean:
diff --git a/doc/supplements/i960/Makefile b/doc/supplements/i960/Makefile
index 498b08ec85..4946be296f 100644
--- a/doc/supplements/i960/Makefile
+++ b/doc/supplements/i960/Makefile
@@ -33,24 +33,25 @@ info: dirs c_i960
 c_i960: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-dvi: $(PROJECT).dvi
+dvi: dirs $(PROJECT).dvi
 ps: dirs $(PROJECT).ps
 pdf: dirs $(PROJECT).pdf
 	
 $(PROJECT).pdf: $(FILES)
 	$(TEXI2PDF) $(PROJECT).texi
-	cp $(PROJECT).pdf $(PDF_INSTALL)
+	cp $(PROJECT).pdf $(WWW_INSTALL)/$(PROJECT)
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
+	cp $(PROJECT).ps $(WWW_INSTALL)/$(PROJECT)
 
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
+	cp $(PROJECT).dvi $(WWW_INSTALL)/$(PROJECT)
 
 html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_i960
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
+	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
+	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
 
 clean:
diff --git a/doc/supplements/m68k/Makefile b/doc/supplements/m68k/Makefile
index d456ab7207..d4eae807ec 100644
--- a/doc/supplements/m68k/Makefile
+++ b/doc/supplements/m68k/Makefile
@@ -33,24 +33,25 @@ info: dirs c_m68k
 c_m68k: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-dvi: $(PROJECT).dvi
+dvi: dirs $(PROJECT).dvi
 ps: dirs $(PROJECT).ps
 pdf: dirs $(PROJECT).pdf
 	
 $(PROJECT).pdf: $(FILES)
 	$(TEXI2PDF) $(PROJECT).texi
-	cp $(PROJECT).pdf $(PDF_INSTALL)
+	cp $(PROJECT).pdf $(WWW_INSTALL)/$(PROJECT)
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
+	cp $(PROJECT).ps $(WWW_INSTALL)/$(PROJECT)
 
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
+	cp $(PROJECT).dvi $(WWW_INSTALL)/$(PROJECT)
 
 html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_m68k
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
+	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
+	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
 
 clean:
diff --git a/doc/supplements/mips64orion/Makefile b/doc/supplements/mips64orion/Makefile
index 9874a46b2e..a49f3e634b 100644
--- a/doc/supplements/mips64orion/Makefile
+++ b/doc/supplements/mips64orion/Makefile
@@ -34,24 +34,25 @@ info: dirs c_$(PROJECT)
 c_$(PROJECT): $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-dvi: $(PROJECT).dvi
+dvi: dirs $(PROJECT).dvi
 ps: dirs $(PROJECT).ps
 pdf: dirs $(PROJECT).pdf
 	
 $(PROJECT).pdf: $(FILES)
 	$(TEXI2PDF) $(PROJECT).texi
-	cp $(PROJECT).pdf $(PDF_INSTALL)
+	cp $(PROJECT).pdf $(WWW_INSTALL)/$(PROJECT)
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
+	cp $(PROJECT).ps $(WWW_INSTALL)/$(PROJECT)
 
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
+	cp $(PROJECT).dvi $(WWW_INSTALL)/$(PROJECT)
 
 html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
+	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
+	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
 
 clean:
diff --git a/doc/supplements/powerpc/Makefile b/doc/supplements/powerpc/Makefile
index 68453b9ae7..1e40a1ec3a 100644
--- a/doc/supplements/powerpc/Makefile
+++ b/doc/supplements/powerpc/Makefile
@@ -35,24 +35,25 @@ info: dirs c_$(PROJECT)
 c_$(PROJECT): $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-dvi: $(PROJECT).dvi
+dvi: dirs $(PROJECT).dvi
 ps: dirs $(PROJECT).ps
 pdf: dirs $(PROJECT).pdf
 	
 $(PROJECT).pdf: $(FILES)
 	$(TEXI2PDF) $(PROJECT).texi
-	cp $(PROJECT).pdf $(PDF_INSTALL)
+	cp $(PROJECT).pdf $(WWW_INSTALL)/$(PROJECT)
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
+	cp $(PROJECT).ps $(WWW_INSTALL)/$(PROJECT)
 
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
+	cp $(PROJECT).dvi $(WWW_INSTALL)/$(PROJECT)
 
 html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
+	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
+	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
 
 clean:
diff --git a/doc/supplements/sh/Makefile b/doc/supplements/sh/Makefile
index b0fafffc84..49942f3509 100644
--- a/doc/supplements/sh/Makefile
+++ b/doc/supplements/sh/Makefile
@@ -34,24 +34,25 @@ info: dirs c_$(PROJECT)
 c_$(PROJECT): $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-dvi: $(PROJECT).dvi
+dvi: dirs $(PROJECT).dvi
 ps: dirs $(PROJECT).ps
 pdf: dirs $(PROJECT).pdf
 	
 $(PROJECT).pdf: $(FILES)
 	$(TEXI2PDF) $(PROJECT).texi
-	cp $(PROJECT).pdf $(PDF_INSTALL)
+	cp $(PROJECT).pdf $(WWW_INSTALL)/$(PROJECT)
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
+	cp $(PROJECT).ps $(WWW_INSTALL)/$(PROJECT)
 
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
+	cp $(PROJECT).dvi $(WWW_INSTALL)/$(PROJECT)
 
 html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
+	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
+	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
 
 clean:
diff --git a/doc/supplements/sparc/Makefile b/doc/supplements/sparc/Makefile
index 38ea9e6940..fc9202ee52 100644
--- a/doc/supplements/sparc/Makefile
+++ b/doc/supplements/sparc/Makefile
@@ -35,24 +35,25 @@ info: dirs c_sparc
 c_sparc: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-dvi: $(PROJECT).dvi
+dvi: dirs $(PROJECT).dvi
 ps: dirs $(PROJECT).ps
 pdf: dirs $(PROJECT).pdf
 	
 $(PROJECT).pdf: $(FILES)
 	$(TEXI2PDF) $(PROJECT).texi
-	cp $(PROJECT).pdf $(PDF_INSTALL)
+	cp $(PROJECT).pdf $(WWW_INSTALL)/$(PROJECT)
 	
 $(PROJECT).ps: dirs $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
+	cp $(PROJECT).ps $(WWW_INSTALL)/$(PROJECT)
 
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
+	cp $(PROJECT).dvi $(WWW_INSTALL)/$(PROJECT)
 
 html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
+	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
+	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
 
 clean:
diff --git a/doc/supplements/template/Makefile b/doc/supplements/template/Makefile
index 64e759f831..fcac6d5c59 100644
--- a/doc/supplements/template/Makefile
+++ b/doc/supplements/template/Makefile
@@ -34,24 +34,25 @@ info: dirs c_$(PROJECT)
 c_$(PROJECT): $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-dvi: $(PROJECT).dvi
+dvi: dirs $(PROJECT).dvi
 ps: dirs $(PROJECT).ps
 pdf: dirs $(PROJECT).pdf
 	
 $(PROJECT).pdf: $(FILES)
 	$(TEXI2PDF) $(PROJECT).texi
-	cp $(PROJECT).pdf $(PDF_INSTALL)
+	cp $(PROJECT).pdf $(WWW_INSTALL)/$(PROJECT)
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
-	cp $(PROJECT).ps $(PS_INSTALL)
+	cp $(PROJECT).ps $(WWW_INSTALL)/$(PROJECT)
 
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
+	cp $(PROJECT).dvi $(WWW_INSTALL)/$(PROJECT)
 
 html: dirs $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
-	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
+	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
+	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
 
 clean: