From 92173590948e4be126bb76bed68a1ceadfbddcd5 Mon Sep 17 00:00:00 2001
From: skimo <skimo>
Date: Sun, 28 Jan 2001 15:50:07 +0000
Subject: [PATCH] small changes to rules creating html files

---
 docs/edit/Makefile   | 4 ++--
 docs/exref/Makefile  | 6 +++---
 docs/vi.man/Makefile | 6 +++---
 docs/vi.ref/Makefile | 6 +++---
 docs/vitut/Makefile  | 8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/edit/Makefile b/docs/edit/Makefile
index b9b15027..502fd750 100644
--- a/docs/edit/Makefile
+++ b/docs/edit/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 8.5 2001/01/28 15:28:47 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:28:47 $
+# $Id: Makefile,v 8.6 2001/01/28 15:50:07 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:50:07 $
 
 ROFF=	groff
 TBL=	tbl
@@ -8,7 +8,7 @@ all: edittut.ps ../html/edittut.html
 ../html/%.html: %.ms
 	${TBL} $< | ${ROFF} -ms -Thtml | \
 	    sed 's/<img src="$<.*png">//' > $@
-	rm "$<"*png
+	rm -f "$<"*png
 	chmod 444 $@
 
 %.ps: %.ms
diff --git a/docs/exref/Makefile b/docs/exref/Makefile
index 6719995a..22b83d91 100644
--- a/docs/exref/Makefile
+++ b/docs/exref/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 8.9 2001/01/28 15:28:47 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:28:47 $
+# $Id: Makefile,v 8.10 2001/01/28 15:50:07 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:50:07 $
 
 ROFF=	groff
 TBL=	tbl
@@ -10,13 +10,13 @@ all: $(ALL)
 ../html/exref.html: ex.rm
 	${TBL} $< | ${ROFF} -ms -Thtml | \
 	    sed 's/<img src="$<.*png">//' > $@
-	rm "$<"*png
+	rm -f "$<"*png
 	chmod 444 $@
 
 ../html/ex-summary.html: ex.summary
 	${TBL} $< | ${ROFF} -ms -Thtml | \
 	    sed 's/<img src="$<.*png">//' > $@
-	rm "$<"*png
+	rm -f "$<"*png
 	chmod 444 $@
 
 exref.ps: ex.rm
diff --git a/docs/vi.man/Makefile b/docs/vi.man/Makefile
index 2c4981e0..bb2a438e 100644
--- a/docs/vi.man/Makefile
+++ b/docs/vi.man/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 8.8 2001/01/28 15:28:48 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:28:48 $
+# $Id: Makefile,v 8.9 2001/01/28 15:50:07 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:50:07 $
 
 ROFF=	groff
 
@@ -13,9 +13,9 @@ vi.0.ps: vi.1
 	chmod 444 $@
 
 ../html/vi.0.html: vi.1
-	${TBL} $< | ${ROFF} -ms -Thtml | \
+	${ROFF} -man -Thtml < vi.1 | \
 	    sed 's/<img src="$<.*png">//' > $@
-	rm "$<"*png
+	rm -f "$<"*png
 	chmod 444 $@
 
 clean:
diff --git a/docs/vi.ref/Makefile b/docs/vi.ref/Makefile
index bc61ddcb..bc125a02 100644
--- a/docs/vi.ref/Makefile
+++ b/docs/vi.ref/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 8.21 2001/01/28 15:28:48 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:28:48 $
+#	$Id: Makefile,v 8.22 2001/01/28 15:50:07 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:50:07 $
 
 MACROS=	-me
 ROFF=	groff
@@ -17,9 +17,9 @@ vi.ref.ps: vi.ref index.so
 	chmod 444 $@
 
 ../html/vi.ref.html: vi.ref index.so
-	${TBL} $< | ${ROFF} -ms -Thtml | \
+	soelim $< | ${TBL} | ${ROFF} ${MACROS} -Thtml | \
 	    sed 's/<img src="$<.*png">//' > $@
-	rm "$<"*png
+	rm -f "$<"*png
 	chmod 444 $@
 
 index.so: vi.ref
diff --git a/docs/vitut/Makefile b/docs/vitut/Makefile
index 088ce1e5..e84a3609 100644
--- a/docs/vitut/Makefile
+++ b/docs/vitut/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 8.9 2001/01/28 15:31:32 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:31:32 $
+#	$Id: Makefile,v 8.10 2001/01/28 15:50:08 skimo Exp $ (Berkeley) $Date: 2001/01/28 15:50:08 $
 
 MACROS=	-ms
 ROFF=	groff
@@ -22,19 +22,19 @@ viapwh.ps: vi.apwh.ms
 ../html/vitut.html: vi.in vi.chars
 	${TBL} $+ | ${ROFF} -ms -Thtml | \
 	    sed 's/<img src=".*png">//' > $@
-	rm *png
+	rm -f *png
 	chmod 444 $@
 
 ../html/vi-summary.html: vi.summary
 	${TBL} $< | ${ROFF} -ms -Thtml | \
 	    sed 's/<img src="$<.*png">//' > $@
-	rm "$<"*png
+	rm -f "$<"*png
 	chmod 444 $@
 
 ../html/viapwh.html: vi.apwh.ms
 	${TBL} $< | ${ROFF} -ms -Thtml | \
 	    sed 's/<img src="$<.*png">//' > $@
-	rm "$<"*png
+	rm -f "$<"*png
 	chmod 444 $@
 
 clean:
-- 
2.11.4.GIT