Making the stanza right and improving the way the isntall directories are built

6 files changed, 45 insertions, 91 deletions

diff --git a/doc/supplements/hppa1_1/Makefile b/doc/supplements/hppa1_1/Makefile
index 3760bcc4f2..a5daeb9190 100644
--- a/doc/supplements/hppa1_1/Makefile
+++ b/doc/supplements/hppa1_1/Makefile
@@ -13,7 +13,10 @@ include ../Make.config
 
 REPLACE=../tools/word-replace
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi ../common/setup.texi \
   ../common/timing.texi
@@ -22,30 +25,19 @@ FILES= $(PROJECT).texi \
   bsp.texi callconv.texi cpumodel.texi cputable.texi fatalerr.texi \
   intr.texi memmodel.texi preface.texi timetbl.texi timedata.texi wksheets.texi 
 
-all:
-
-info: c_hppa1_1
+info: dirs c_hppa1_1
 	cp c_$(PROJECT) $(INFO_INSTALL)
 
 c_hppa1_1: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f c_hppa1_1
-
 dvi: $(PROJECT).dvi
-ps: $(PROJECT).ps
+ps: dirs $(PROJECT).ps
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
 	cp $(PROJECT).ps $(PS_INSTALL)
 
-dv: dvi
-	$(XDVI) $(PROJECT).dvi
-
-view: ps
-	$(GHOSTVIEW) $(PROJECT).ps
-
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
 
@@ -76,7 +68,7 @@ wksheets.texi: wksheets.t TIMES
 	${REPLACE} -p TIMES wksheets.t
 	mv wksheets.t.fixed wksheets.texi
 
-html: $(FILES)
+html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/c_hppa1_1
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
  	    $(PROJECT).texi
diff --git a/doc/supplements/i386/Makefile b/doc/supplements/i386/Makefile
index 2085f6b106..24b3b7d8f0 100644
--- a/doc/supplements/i386/Makefile
+++ b/doc/supplements/i386/Makefile
@@ -13,7 +13,10 @@ include ../Make.config
 
 REPLACE=../tools/word-replace
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi ../common/setup.texi \
   ../common/timing.texi
@@ -22,30 +25,19 @@ FILES= $(PROJECT).texi \
   bsp.texi callconv.texi cpumodel.texi cputable.texi fatalerr.texi \
   intr.texi memmodel.texi preface.texi timetbl.texi timedata.texi wksheets.texi 
 
-all:
-
-info: c_i386
+info: dirs c_i386
 	cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
 
 c_i386: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f c_i386
-
 dvi: $(PROJECT).dvi
-ps: $(PROJECT).ps
+ps: dirs $(PROJECT).ps
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
 	cp $(PROJECT).ps $(PS_INSTALL)
 
-dv: dvi
-	$(XDVI) $(PROJECT).dvi
-
-view: ps
-	$(GHOSTVIEW) $(PROJECT).ps
-
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
 
@@ -76,7 +68,7 @@ wksheets.texi: wksheets.t FORCE386_TIMES
 	${REPLACE} -p FORCE386_TIMES wksheets.t
 	mv wksheets.t.fixed wksheets.texi
 
-html: $(FILES)
+html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/c_i386
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
  	    $(PROJECT).texi
diff --git a/doc/supplements/i960/Makefile b/doc/supplements/i960/Makefile
index 89343a3fa2..bb3bbf4abb 100644
--- a/doc/supplements/i960/Makefile
+++ b/doc/supplements/i960/Makefile
@@ -13,7 +13,10 @@ include ../Make.config
 
 REPLACE=../tools/word-replace
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi ../common/setup.texi \
   ../common/timing.texi
@@ -22,30 +25,19 @@ FILES= $(PROJECT).texi \
   bsp.texi callconv.texi cpumodel.texi cputable.texi fatalerr.texi \
   intr.texi memmodel.texi preface.texi timetbl.texi timedata.texi wksheets.texi 
 
-all:
-
-info: c_i960
+info: dirs c_i960
 	cp c_$(PROJECT) $(INFO_INSTALL)
 
 c_i960: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f c_i960
-
 dvi: $(PROJECT).dvi
-ps: $(PROJECT).ps
+ps: dirs $(PROJECT).ps
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
 	cp $(PROJECT).ps $(PS_INSTALL)
 
-dv: dvi
-	$(XDVI) $(PROJECT).dvi
-
-view: ps
-	$(GHOSTVIEW) $(PROJECT).ps
-
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
 
@@ -76,7 +68,7 @@ wksheets.texi: wksheets.t CVME961_TIMES
 	${REPLACE} -p CVME961_TIMES wksheets.t
 	mv wksheets.t.fixed wksheets.texi
 
-html: $(FILES)
+html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/c_i960
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
  	    $(PROJECT).texi
diff --git a/doc/supplements/m68k/Makefile b/doc/supplements/m68k/Makefile
index 53505aa185..377bcc7609 100644
--- a/doc/supplements/m68k/Makefile
+++ b/doc/supplements/m68k/Makefile
@@ -13,7 +13,10 @@ include ../Make.config
 
 REPLACE=../tools/word-replace
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi ../common/setup.texi \
   ../common/timing.texi
@@ -22,30 +25,19 @@ FILES= $(PROJECT).texi \
   bsp.texi callconv.texi cpumodel.texi cputable.texi fatalerr.texi \
   intr.texi memmodel.texi preface.texi timetbl.texi timedata.texi wksheets.texi 
 
-all:
-
-info: c_m68k
+info: dirs c_m68k
 	cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
 
 c_m68k: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f c_m68k
-
 dvi: $(PROJECT).dvi
-ps: $(PROJECT).ps
+ps: dirs $(PROJECT).ps
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
 	cp $(PROJECT).ps $(PS_INSTALL)
 
-dv: dvi
-	$(XDVI) $(PROJECT).dvi
-
-view: ps
-	$(GHOSTVIEW) $(PROJECT).ps
-
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
 
@@ -76,7 +68,7 @@ wksheets.texi: wksheets.t MVME136_TIMES
 	${REPLACE} -p MVME136_TIMES wksheets.t
 	mv wksheets.t.fixed wksheets.texi
 
-html: $(FILES)
+html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/c_m68k
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
  	    $(PROJECT).texi
diff --git a/doc/supplements/powerpc/Makefile b/doc/supplements/powerpc/Makefile
index ed235f9b7f..b329eba52d 100644
--- a/doc/supplements/powerpc/Makefile
+++ b/doc/supplements/powerpc/Makefile
@@ -13,7 +13,10 @@ include ../Make.config
 
 REPLACE=../tools/word-replace
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi ../common/setup.texi \
   ../common/timing.texi
@@ -22,32 +25,21 @@ FILES= $(PROJECT).texi \
   bsp.texi callconv.texi cpumodel.texi cputable.texi fatalerr.texi \
   intr.texi memmodel.texi preface.texi timetbl.texi timedata.texi wksheets.texi 
 
-all:
-
 INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
 
-info: c_$(PROJECT)
+info: dirs c_$(PROJECT)
 	cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
 
 c_$(PROJECT): $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f c_$(PROJECT)
-
 dvi: $(PROJECT).dvi
-ps: $(PROJECT).ps
+ps: dirs $(PROJECT).ps
 	
 $(PROJECT).ps: $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
 	cp $(PROJECT).ps $(PS_INSTALL)
 
-dv: dvi
-	$(XDVI) $(PROJECT).dvi
-
-view: ps
-	$(GHOSTVIEW) $(PROJECT).ps
-
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
 
@@ -78,7 +70,7 @@ wksheets.texi: wksheets.t PSIM_TIMES
 	${REPLACE} -p PSIM_TIMES wksheets.t
 	mv wksheets.t.fixed wksheets.texi
 
-html: $(FILES)
+html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/c_$(PROJECT)
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
  	    $(PROJECT).texi
diff --git a/doc/supplements/sparc/Makefile b/doc/supplements/sparc/Makefile
index 70398a2971..2030ff426f 100644
--- a/doc/supplements/sparc/Makefile
+++ b/doc/supplements/sparc/Makefile
@@ -13,7 +13,10 @@ include ../Make.config
 
 REPLACE=../tools/word-replace
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi ../common/setup.texi \
   ../common/timing.texi
@@ -22,32 +25,24 @@ FILES= $(PROJECT).texi \
   bsp.texi callconv.texi cpumodel.texi cputable.texi fatalerr.texi \
   intr.texi memmodel.texi preface.texi timetbl.texi timedata.texi wksheets.texi 
 
-all:
+dirs:
+	$(make-dirs)
 
 INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
 
-info: c_sparc
+info: dirs c_sparc
 	cp c_$(PROJECT) c_$(PROJECT)-* $(INFO_INSTALL)
 
 c_sparc: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f c_sparc
-
 dvi: $(PROJECT).dvi
-ps: $(PROJECT).ps
+ps: dirs $(PROJECT).ps
 	
-$(PROJECT).ps: $(PROJECT).dvi
+$(PROJECT).ps: dirs $(PROJECT).dvi
 	dvips -o $(PROJECT).ps $(PROJECT).dvi
 	cp $(PROJECT).ps $(PS_INSTALL)
 
-dv: dvi
-	$(XDVI) $(PROJECT).dvi
-
-view: ps
-	$(GHOSTVIEW) $(PROJECT).ps
-
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
 
@@ -78,8 +73,7 @@ wksheets.texi: wksheets.t SIS_TIMES
 	${REPLACE} -p SIS_TIMES wksheets.t
 	mv wksheets.t.fixed wksheets.texi
 
-html: $(FILES)
-	-mkdir -p $(WWW_INSTALL)/c_sparc
+html: dirs dirs $(FILES)
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/c_$(PROJECT) \
  	    $(PROJECT).texi