--- gforth/Makefile.in	2003/08/16 19:46:10	1.272
+++ gforth/Makefile.in	2003/08/25 08:02:58	1.276
@@ -362,7 +362,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 +371,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 +451,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 \
@@ -470,11 +471,16 @@ virtualclean:	mostlyclean
 #Some makes (Ultrix, SunOS, IRIX) are so broken, they cannot read the
 #Makefile if it contains our dist rules.  Therefore we have put these
 #rules in Makedist (you can use them with GNU make on these systems).
-dist:		Makedist FORCE
+
+dist:		Makedist machpc.fs FORCE
+		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
 		$(MAKE) -f Makedist d$@
+		-$(RM) machpc.fs
 
-dosdist:	Makedist FORCE
+dosdist:	Makedist machpc.fs FORCE
+		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
 		$(MAKE) -f Makedist d$@
+		-$(RM) machpc.fs
 
 srcdist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
@@ -488,12 +494,20 @@ docdist:	Makedist FORCE
 htmldist:	Makedist FORCE
 		$(MAKE) -f Makedist d$@
 
-bindist:	Makedist FORCE
+bindist:	Makedist machpc.fs FORCE
+		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
 		$(MAKE) -f Makedist d$@
+		-$(RM) machpc.fs
 
-binonlydist:	Makedist FORCE
+binonlydist:	Makedist machpc.fs FORCE
+		-sed -e 's/@[^ ]*CALLFLAG@/false/g' -e 's/@[P]EEPHOLEFLAG@/true/g' <machpc.fs.in >machpc.fs
 		$(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.
@@ -629,12 +643,12 @@ kernl64b.fi-:	$(KERN_DEPS) mach64b.fs
 		$(FORTHB) -e 's" mach64b.fs"' $(srcdir)/kernel/main.fs -e "save-cross kernl64b.fi- $(bindir)/gforth-$(VERSION) bye"
 
 #Solaris make does not like that:
-#kernl-%.fi:	arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
-#		$(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
-#		if [ -f `echo $< | sed s/fs/sh/` ]; \
-#		then sh `echo $< | sed s/fs/sh/` $@; \
-#		else $(CP) $@- $@; \
-#		fi
+@GNUMAKE@kernl-%.fi:	arch/%/mach.fs arch/%/prim.fs arch/%/asm.fs $(KERN_SRC) kernel/version.fs $(FORTH_GEN0)
+@GNUMAKE@		$(FORTHB) -e 's" $<"' $(srcdir)/kernel/main.fs -e "save-cross $@- $(bindir)/gforth-$(VERSION) bye"
+@GNUMAKE@		if [ -f `echo $< | sed s/fs/sh/` ]; \
+@GNUMAKE@		then sh `echo $< | sed s/fs/sh/` $@; \
+@GNUMAKE@		else $(CP) $@- $@; \
+@GNUMAKE@		fi
 
 #SunOS make does not like that
 #arch/%/mach.fs:	arch/%/prim.fs arch/%/asm.fs
@@ -673,7 +687,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" >$@-
@@ -782,7 +797,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
@@ -868,7 +883,7 @@ doc/gforth.txt:	$(GFORTH_TEXI)
 doc/vmgen.txt:	$(VMGEN_TEXI)
 		-cd doc; $(MAKEINFO) --no-headers --no-split vmgen.texi >vmgen.txt
 
-doc:		info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS
+doc:		gforth.fi info doc/gforth doc/vmgen doc/gforth.ps doc/vmgen.ps doc/gforth.txt doc/vmgen.txt TAGS
 
 # For an explanation of the following Makefile rules, see node
 # `Automatic Remaking' in GNU Autoconf documentation.