--- gforth/Makefile.in	2003/08/23 20:16:08	1.274
+++ gforth/Makefile.in	2003/08/31 17:41:23	1.278
@@ -88,7 +88,8 @@ FORTHK	= $(ENGINE) $(FORTHKFLAGS)
 STARTUP	= -e 3 exboot.fs startup.fs @asm_fs@ @disasm_fs@
 STRIP	= strip
 TEXI2DVI = texi2dvi -e
-DVI2PS	= dvips -t letterSize -Z
+TEXI2PDF = texi2dvi --pdf -e
+DVI2PS	= dvips -Pcmz -t letterSize -Z
 #you can get texi2html from http://wwwcn.cern.ch/dci/texi2html/
 MAKEINFO = makeinfo
 TEXI2HTML = texi2html
@@ -231,7 +232,7 @@ GFORTH_FI_SRC = \
 FORTH_SRC = $(KERN_SRC) $(GFORTH_FI_SRC) $(EC_SRC) \
 	ans-report.fs ansi.fs answords.fs \
 	colorize.fs comp-i.fs \
-	doskey.fs ds2texi.fs \
+	dosekey.fs doskey.fs ds2texi.fs \
 	envos.fs envos.dos envos.os2 etags.fs filedump.fs fi2c.fs \
 	glosgen.fs gray.fs httpd.fs proxy.fs \
 	make-app.fs doc/makedoc.fs \
@@ -362,7 +363,7 @@ SOURCES	= $(CVSDIRS) compat Makefile.in
 
 RCS_FILES =  ToDo model high-level
 
-ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) gforth-prof$(EXE) #gforth-native$(EXE)
+ENGINES = gforth$(EXE) gforth-ditc$(EXE) gforth-fast$(EXE) gforth-itc$(EXE) #gforth-prof$(EXE) #gforth-native$(EXE)
 
 GEN = $(ENGINES) kernel/version.fs
 
@@ -371,7 +372,8 @@ FORTH_GEN_ENGINE=engine/prim.i engine/pr
 	engine/prim_superend.i engine/profile.i \
 	engine/prim_num.i engine/prim_grp.i \
 	engine/costs.i engine/super2.i
-FORTH_GEN0 = prim.b $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs
+FORTH_GEN_PRIMB = $(FORTH_GEN_ENGINE) kernel/aliases.fs kernel/prim.fs
+FORTH_GEN0 = prim.b $(FORTH_GEN_PRIMB)
 FORTH_GEN =  $(FORTH_GEN0) @KERNEL@ gforth.fi
 # this is used for antidependences,
 FORTH_GEN1 = $(FORTH_GEN0) @kernel_fi@ 
@@ -450,7 +452,7 @@ clean:		mostlyclean
 		-$(RM) -rf $(GEN) *.o engine/*.o arch/*/*.o version \
 		engine/gforth$(EXE) engine/gforth-fast$(EXE) \
                 engine/gforth-native$(EXE) engine/gforth-itc$(EXE) \
-		engine/gforth-ditc$(EXE) engine/gforth-prof$(EXE)
+		engine/gforth-ditc$(EXE) #engine/gforth-prof$(EXE)
 
 distclean:	clean
 		-$(RM) -rf config.cache config.log config.status \
@@ -503,6 +505,10 @@ binonlydist:	Makedist machpc.fs FORCE
 		$(MAKE) -f Makedist d$@
 		-$(RM) machpc.fs
 
+#HPUX make breaks the cycle differently when the dates are equal, so
+# touch some of the files if it acts up
+hpux-workaround:
+	touch $(FORTH_GEN_PRIMB)
 
 #strip gforth, because the debugging stuff is hardly useful once
 # gforth manages to execute more than a few primitives.
@@ -682,7 +688,8 @@ gforth.fi:	$(kernel_fi) gforthmi gforth$
 # -------------	Make c-engine
 
 prim.b:		prim peeprules.vmg
-		m4 -s $(srcdir)/prim >$@ 
+		m4 -s $(srcdir)/prim >$@
+		sleep 1 #should make hpux-workaround unnecessary
 
 engine/prim.i:		prim.b prims2x.fs
 		$(FORTHP) prims2x.fs -e "c-flag on s\" prim.i\" save-mem out-filename 2! s\" prim.b\" ' output-c ' output-c-combined process-file bye" >$@-
@@ -791,7 +798,7 @@ tags:		gforth.tags
 		$(CP) gforth.tags $@
 
 install.TAGS:	gforth.TAGS
-		sed 's:^\$(srcdir)/:$(datadir)/gforth/$(VERSION)/:' gforth.TAGS >install.TAGS
+		sed 's;^\$(srcdir)/;$(datadir)/gforth/$(VERSION)/;' gforth.TAGS >install.TAGS
 
 gforth.TAGS:	@kernel_fi@ gforth$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS
 		$(FORTHK) etags.fs except.fs startup.fs -e bye
@@ -843,12 +850,20 @@ checkdoc:	doc/gforth.ds prim.b ds2texi.f
 
 dvi:		doc/gforth.dvi doc/vmgen.dvi
 
+pdf:		doc/gforth.pdf doc/vmgen.pdf
+
 doc/gforth.dvi doc/gforth.fns:	$(GFORTH_TEXI)
 		cd doc; $(TEXI2DVI) gforth.texi
 
+doc/gforth.pdf:	$(GFORTH_TEXI)
+		cd doc; $(TEXI2PDF) gforth.texi
+
 doc/vmgen.dvi:	$(VMGEN_TEXI)
 		cd doc; $(TEXI2DVI) vmgen.texi
 
+doc/vmgen.pdf:	$(VMGEN_TEXI)
+		cd doc; $(TEXI2PDF) vmgen.texi
+
 doc/gforth.ps:	doc/gforth.dvi
 		$(DVI2PS) doc/gforth.dvi -o $@