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

15 files changed, 115 insertions, 218 deletions

diff --git a/doc/Make.config b/doc/Make.config
index 507e8c97cd..aabcaded81 100644
--- a/doc/Make.config
+++ b/doc/Make.config
@@ -19,24 +19,17 @@ INFO=info
 XDVI=xdvi -s 4
 GHOSTVIEW=ghostview -magstep -1
 
+# Account for tree organization which restricts visibility
 ifeq ($(DISTRIBUTION_LEVEL),public)
+RLEVEL=
 WWW_INSTALL=$(DOC_INSTALL_BASE)/html
-else
-WWW_INSTALL=$(DOC_INSTALL_BASE)/html/$(DISTRIBUTION_LEVEL)
-endif
 INFO_INSTALL=$(DOC_INSTALL_BASE)/info
 PS_INSTALL=$(DOC_INSTALL_BASE)/ps
-
-ifeq ($(DISTRIBUTION_LEVEL),support)
-RLEVEL=../
-else
-ifeq ($(DISTRIBUTION_LEVEL),partners)
-RLEVEL=../
 else
-ifeq ($(DISTRIBUTION_LEVEL),internal)
-RLEVEL=../
-endif
-endif
+RLEVEL=..
+WWW_INSTALL=$(DOC_INSTALL_BASE)/html/$(DISTRIBUTION_LEVEL)
+INFO_INSTALL=$(DOC_INSTALL_BASE)/info/$(DISTRIBUTION_LEVEL)
+PS_INSTALL=$(DOC_INSTALL_BASE)/ps/$(DISTRIBUTION_LEVEL)
 endif
 
 #TEXI2WWW_ARGS=-dirfile $(WWW_INSTALL)/index.html \
@@ -46,3 +39,15 @@ TEXI2WWW_ARGS=-dirfile ../$(RLEVEL)index.html \
           -header $(WWW_INSTALL)/$(RLEVEL)rtems_header.html \
           -footer $(WWW_INSTALL)/$(RLEVEL)rtems_footer.html
 
+define make-dirs
+	@ if [ ! -d $(WWW_INSTALL) ] ; then \
+	    mkdir -p $(WWW_INSTALL); \
+	  fi
+	@ if [ ! -d $(INFO_INSTALL) ] ; then \
+	    mkdir -p $(INFO_INSTALL); \
+	  fi
+	@ if [ ! -d $(PS_INSTALL) ] ; then \
+	    mkdir -p $(PS_INSTALL); \
+	  fi
+endef
+
diff --git a/doc/Makefile b/doc/Makefile
index 34c2b5542c..09072f1792 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -13,13 +13,6 @@ all: env info html ps
 env: tools dirs headers
 
 dirs:
-	-mkdir $(DOC_INSTALL_BASE)
-	-mkdir $(WWW_INSTALL)
-	-mkdir $(WWW_INSTALL)/partners
-	-mkdir $(WWW_INSTALL)/support
-	-mkdir $(WWW_INSTALL)/internal
-	-mkdir $(INFO_INSTALL)
-	-mkdir $(PS_INSTALL)
 
 headers:
 	sed -e 's/RTEMS_VERSION/$(RTEMS_VERSION)/' \
@@ -36,7 +29,7 @@ html: env
 	cp common/*.gif common/*.jpg $(WWW_INSTALL)
 	./do_docs $(BASEDIR) html
 
-ps: env
+ps: dirs env
 	./do_docs $(BASEDIR) ps
 
 clean:
diff --git a/doc/ada_user/Makefile b/doc/ada_user/Makefile
index f3232dc0e1..67fd7229ef 100644
--- a/doc/ada_user/Makefile
+++ b/doc/ada_user/Makefile
@@ -11,7 +11,7 @@ DISTRIBUTION_LEVEL=internal
 
 include ../Make.config
 
-all:  
+all: html info ps
 
 COMMON_FILES=../common/cpright.texi ../user/bsp.texi ../user/clock.texi \
   ../user/concepts.texi ../user/conf.texi ../user/dirstat.texi \
@@ -24,37 +24,28 @@ COMMON_FILES=../common/cpright.texi ../user/bsp.texi ../user/clock.texi \
   ../user/timer.texi ../user/userext.texi 
 FILES= ada_user.texi example.texi $(COMMON_FILES)
 
-all:
+dirs:
+	$(make-dirs)
 
 INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
 
-info: ada_user
+info: dirs ada_user
 	cp $(PROJECT) $(PROJECT)-* $(INFO_INSTALL)
 
 ada_user: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f $(PROJECT)
-
 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
 
-html:
-	-mkdir -p $(WWW_INSTALL)/ada_user
+html: dirs $(FILES)
 	cp ../user/rtemsarc.gif ../user/rtemspie.gif ../user/states.gif \
            $(WWW_INSTALL)/ada_user
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
diff --git a/doc/develenv/Makefile b/doc/develenv/Makefile
index d7dfda88a6..c93c8da2d7 100644
--- a/doc/develenv/Makefile
+++ b/doc/develenv/Makefile
@@ -11,40 +11,32 @@ DISTRIBUTION_LEVEL=public
 
 include ../Make.config
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi
 
 FILES=compile.texi $(PROJECT).texi direct.texi intro.texi sample.texi utils.texi
 
-all:
-
-info: $(PROJECT)
+info: dirs $(PROJECT)
 	cp $(PROJECT) $(INFO_INSTALL)
 
 $(PROJECT): $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f $(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)
 
-view: ps
-	$(GHOSTVIEW) $(PROJECT).ps
-
-dv: dvi
-	$(XDVI) $(PROJECT).dvi
-
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
 
-html:
+html: dirs
 	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
 	-cd .. ; gmake headers
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
diff --git a/doc/new_chapters/Makefile b/doc/new_chapters/Makefile
index b5a5d237a1..de2fdfde4e 100644
--- a/doc/new_chapters/Makefile
+++ b/doc/new_chapters/Makefile
@@ -11,43 +11,36 @@ DISTRIBUTION_LEVEL=public
 
 include ../Make.config
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi
+
 FILES= clock.texi cond.texi key.texi mutex.texi $(PROJECT).texi preface.texi \
   sched.texi signal.texi thread.texi $(COMMON_FILES)
 
-all:
-
 INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
 
-info: $(PROJECT)
+info: dirs $(PROJECT)
 #	cp $(PROJECT) $(PROJECT)-* $(INFO_INSTALL)
 	cp $(PROJECT) $(INFO_INSTALL)
 
 posix_users: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f ./$(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
 
-html:
+html: dirs
 	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
 	-cd .. ; gmake headers
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
diff --git a/doc/posix1003.1/Makefile b/doc/posix1003.1/Makefile
index 9a7ee803da..ca16406029 100644
--- a/doc/posix1003.1/Makefile
+++ b/doc/posix1003.1/Makefile
@@ -11,7 +11,10 @@ DISTRIBUTION_LEVEL=partners
 
 include ../Make.config
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi ../common/setup.texi
 
@@ -23,33 +26,22 @@ GENERATED_FILES=ch01.texi ch02.texi ch03.texi ch04.texi ch05.texi \
 FILES= $(PROJECT).texi \
   preface.texi $(GENERATED_FILES)
 
-all:
-
 INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
 
-info: $(PROJECT)
+info: dirs $(PROJECT)
 	#cp $(wildcard $(PROJECT) $(PROJECT)-*) $(INFO_INSTALL)
 	cp $(PROJECT) $(INFO_INSTALL)
 
 $(PROJECT): $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f $(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
-
 # run texi2dvi twice to generate the xref's properly.
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) -v $(PROJECT).texi
@@ -155,7 +147,7 @@ ch19.texi: ch19.t
 	    -u "Top" \
 	    -n "Command and Variable Index" ${*}.t
 	
-html: $(FILES)
+html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
diff --git a/doc/posix_users/Makefile b/doc/posix_users/Makefile
index b5a5d237a1..de2fdfde4e 100644
--- a/doc/posix_users/Makefile
+++ b/doc/posix_users/Makefile
@@ -11,43 +11,36 @@ DISTRIBUTION_LEVEL=public
 
 include ../Make.config
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi
+
 FILES= clock.texi cond.texi key.texi mutex.texi $(PROJECT).texi preface.texi \
   sched.texi signal.texi thread.texi $(COMMON_FILES)
 
-all:
-
 INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
 
-info: $(PROJECT)
+info: dirs $(PROJECT)
 #	cp $(PROJECT) $(PROJECT)-* $(INFO_INSTALL)
 	cp $(PROJECT) $(INFO_INSTALL)
 
 posix_users: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f ./$(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
 
-html:
+html: dirs
 	-mkdir -p $(WWW_INSTALL)/$(PROJECT)
 	-cd .. ; gmake headers
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
diff --git a/doc/relnotes/Makefile b/doc/relnotes/Makefile
index 7de1064aef..ac1d9db641 100644
--- a/doc/relnotes/Makefile
+++ b/doc/relnotes/Makefile
@@ -11,40 +11,32 @@ DISTRIBUTION_LEVEL=internal
 
 include ../Make.config
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi
 
 FILES=install.texi intro.texi probrep.texi relnotes.texi status.texi
 
-all:
-
-info: relnotes
+info: dirs relnotes
 	cp $(PROJECT) $(wildcard $(PROJECT)-*) $(INFO_INSTALL)
 
 relnotes: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f relnotes
-
 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)
 
-view: ps
-	$(GHOSTVIEW) $(PROJECT).ps
-
-dv: dvi
-	$(XDVI) $(PROJECT).dvi
-
 $(PROJECT).dvi: $(FILES)
 	$(TEXI2DVI) $(PROJECT).texi
 
-html:
+html: dirs
 	-mkdir -p $(WWW_INSTALL)/relnotes
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \
  	    $(PROJECT).texi
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
 
diff --git a/doc/user/Makefile b/doc/user/Makefile
index 3b3275a3fc..86701d9cb6 100644
--- a/doc/user/Makefile
+++ b/doc/user/Makefile
@@ -11,7 +11,10 @@ DISTRIBUTION_LEVEL=public
 
 include ../Make.config
 
-all:  
+all: html info ps
+
+dirs:
+	$(make-dirs)
 
 COMMON_FILES=../common/cpright.texi
 FILES= bsp.texi c_user.texi clock.texi concepts.texi conf.texi \
@@ -26,36 +29,25 @@ GENERATED_FILES=overview.texi concepts.texi init.texi task.texi \
     dpmem.texi io.texi fatal.texi schedule.texi rtmon.texi \
     bsp.texi userext.texi conf.texi mp.texi 
 
-all:
-
 INFOFILES=$(wildcard $(PROJECT) $(PROJECT)-*)
 
-info: c_user
+info: dirs c_user
 	cp $(PROJECT) $(PROJECT)-* $(INFO_INSTALL)
 
 c_user: $(FILES)
 	$(MAKEINFO) $(PROJECT).texi
 
-vinfo: info
-	$(INFO) -f $(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
 
-html: $(FILES)
+html: dirs $(FILES)
 	-mkdir -p $(WWW_INSTALL)/c_user
 	cp rtemsarc.gif rtemspie.gif states.gif $(WWW_INSTALL)/c_user
 	$(TEXI2WWW) $(TEXI2WWW_ARGS) -dir $(WWW_INSTALL)/$(PROJECT) \