--- gforth/Makefile.in	2008/08/09 14:39:09	1.418
+++ gforth/Makefile.in	2008/10/12 16:31:04	1.428
@@ -45,8 +45,6 @@ EXE=@EXEEXT@
 
 PATHSEP = @PATHSEP@
 
-osclass = @OSCLASS@
-
 EC = @EC@
 
 # -------------	Utility programs
@@ -231,9 +229,11 @@ GFORTH_FI_SRC = \
 	hash.fs \
 	history.fs \
 	intcomp.fs \
+	mkdir.fs \
 	libcc.fs \
 	locals.fs \
 	look.fs \
+	mkdir.fs \
 	quotes.fs \
 	search.fs \
 	see.fs \
@@ -257,9 +257,7 @@ GFORTH_FI_SRC = \
 	arch/mips/testasm.fs arch/mips/testdisasm.fs \
 	arch/power/asm.fs arch/power/disasm.fs arch/power/inst.fs
 
-
-
-LIBCC_SRC = unix/socket.fs
+LIBCC_SRC = cstr.fs unix/socket.fs
 
 LIBCC_DIST_SRC = libffi.fs fflib.fs $(LIBCC_SRC)
 
@@ -406,6 +404,7 @@ ENGINE_SOURCES = engine/Makefile.in engi
 
 SOURCES	= $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \
 	gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \
+	prims2x-0.6.2.fs \
 	autogen.sh configure.in configure config.sub config.guess \
 	elisp-comp missing stamp-h.in envos.fs.in \
 	iss.sh install-sh INSTALL INSTALL.BINDIST NEWS README ToDo BUGS \
@@ -605,13 +604,12 @@ install:	gforth$(EC)$(EXE) $(FORTH_SRC)
 		$(INSTALL_PROGRAM) gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE)
 		(cd $(DESTDIR)$(bindir) && $(LN_S) gforth-itc-$(VERSION)$(EC)$(EXE) gforth-itc$(EC)$(EXE))
 		$(INSTALL_SCRIPT) gforthmi $(DESTDIR)$(bindir)/gforthmi-$(VERSION)
-		#$(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION)
+		$(INSTALL_SCRIPT) vmgen $(DESTDIR)$(bindir)/vmgen-$(VERSION)
 		$(INSTALL_PROGRAM) gforth-ditc $(DESTDIR)$(libdir)/gforth/$(VERSION)
 		(cd $(DESTDIR)$(bindir) && $(LN_S) gforthmi-$(VERSION) gforthmi)
-		#(cd $(DESTDIR)$(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)
+		(cd $(DESTDIR)$(bindir) && $(LN_S) vmgen-$(VERSION) vmgen)
 		-$(INSTALL_DATA) $(srcdir)/doc/gforth.1 $(DESTDIR)$(man1dir)
-		#-for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done
-		-for i in $(srcdir)/doc/gforth.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done
+		-for i in $(srcdir)/doc/gforth.info* $(srcdir)/doc/vmgen.info*; do $(INSTALL_DATA) $$i $(DESTDIR)$(infodir); done
 		for i in $(FORTH_SRC) $(COMPAT) prim; do \
 			$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \
 		done
@@ -654,7 +652,6 @@ uninstall:	FORCE
 
 check-libcc-named: $(LIBCC_BUILD_SRC)
 		$(RMTREE) lib/gforth/$(VERSION)/libcc-named/
-		$(srcdir)/mkinstalldirs lib/gforth/$(VERSION)/libcc-named/
 		for i in $(LIBCC_BUILD_SRC); do ./gforth -e "s\" `pwd`/lib/gforth/$(VERSION)/libcc-named/\" libcc-named-dir-v 2! libcc-path clear-path libcc-named-dir libcc-path also-path :noname 2drop s\" $(libccdir)\" ; is replace-rpath" $$i -e bye; done
 
 check:		gforths	gforth.fi 
@@ -819,7 +816,6 @@ gforth$(OPT)$(EC)$(EXE): $(ENGINE_SOURCE
 		for i in $(OPTS); do $(MAKE) optgforth OPT=$$i && $(CP) gforth$${i}$(EC)$(EXE) $@ && break; done; \
 	else \
 		( cd engine && $(MAKE) $@ ) && \
-		$(CP) gforth$(OPT)$(EC)$(EXE) gforth~; \
 		$(CP) engine/$@ $@ && \
 		$(MASSAGE_EXE) $@; \
 		@GFORTH_EXE@; \
@@ -866,10 +862,12 @@ gforths: $(ENGINES) $(ENGINES_FAST)
 
 # ------------- additional C primitives
 
-%.c:		%.pri prim2cl.fs
+.SUFFIXES:	.c .pri
+
+.pri.c:		$< prim2cl.fs
 		$(FORTHK) prim2cl.fs -e "file $< altogether bye" >$@
 
-%.so:		%.c
+.c.so:		$<
 		$(GCC) -shared $(CFLAGS) $(CPPFLAGS) $< -o $@
 
 # -------------	Make Documentation
@@ -915,7 +913,7 @@ kernel.tags:
 
 #elc files
 gforth.elc:	gforth.el
-		-$(EMACS) -batch -f batch-byte-compile $<
+		-$(EMACS) -batch -f batch-byte-compile gforth.el
 
 #Documentation
 
@@ -934,7 +932,7 @@ doc/gforth.texi: doc/gforth.ds prim.b ds
 checkdoc:	doc/gforth.ds prim.b ds2texi.fs prims2x.fs doc/doc.fd doc/crossdoc.fd answords.fs doc/gforth.texi
 		$(FORTH) ds2texi.fs prims2x.fs -e "s\" $(srcdir)/prim.b\" ' register-doc ' noop process-file" doc/crossdoc.fd doc/doc.fd answords.fs -e bye
 		-grep unknown doc/gforth.texi
-		-grep doc- doc/gforth.texi
+		-grep doc- doc/gforth.texi| grep -v '^@c'
 
 dvi:		doc/gforth.dvi doc/vmgen.dvi