--- gforth/Makedist.in	1998/12/22 21:17:13	1.2
+++ gforth/Makedist.in	2003/09/08 13:03:05	1.18
@@ -1,7 +1,7 @@
 #make dist targets (workaround for broken makes)
 #use GNU make if your make does not grok this.
 
-#Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -17,10 +17,22 @@
 
 #You should have received a copy of the GNU General Public License
 #along with this program; if not, write to the Free Software
-#Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 include Makefile
 
+#!! redundancy with engine/Makefile.in
+DOBJECTS=$(addprefix engine/,io.o signals.o support.o @LIBOBJS@ engine.o engine2.o main.o engine-fast.o engine-fast2.o main-fast.o engine-ditc.o main-ditc.o  engine-itc.o main-itc.o $(PROFOBJS))
+
+#stuff in a binonly distribution 
+BINONLYDIST = config.status Makefile Makedist \
+	$(ENGINES) \
+	$(DOBJECTS) engine/config.h engine/Makefile \
+	engine/gforth$(EXE) engine/gforth-fast$(EXE) \
+        engine/gforth-ditc$(EXE) engine/gforth-itc$(EXE) \
+	engine/gforth-prof$(EXE) stamp-h kernel/version.fs \
+	INSTALL.BINDIST
+
 #use dist targets only when srcdir=.
 ddist:		$(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST)
 		-$(RMTREE) gforth-$(VERSION)
@@ -37,7 +49,7 @@ ddosdist:	$(SOURCES) $(FORTH_GEN0) @KERN
 		$(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) | \
 			(cd gforth.$(DOSVERSION); tar xf -)
 		$(MV) gforth.$(DOSVERSION)/engine/strsignal.c gforth.$(DOSVERSION)/engine/strsig.c
-		for i in 1 2 3 4 5 6 7 8; do \
+		for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14; do \
 			$(MV) gforth.$(DOSVERSION)/doc/gforth.info-$$i gforth.$(DOSVERSION)/doc/gforth.i$$i; \
 		done
 		zip -r9 gf$(DOSVERSION)dos.zip gforth.$(DOSVERSION)/*
@@ -80,8 +92,12 @@ dbindist:	$(SOURCES) $(FORTH_GEN0) @KERN
 		-$(RMTREE) gforth-$(VERSION)
 		mkdir gforth-$(VERSION)
 		$(TAR) $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -)
-		strip gforth-$(VERSION)/gforth
-		$(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-@host@.tar.gz
+		$(STRIP) gforth-$(VERSION){,/engine}/gforth{,-fast,-ditc,-itc}$(EXE)
+		$(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).bin.@host@.tar.gz
+
+#All file names in a binary distribution
+distfiles:
+		@echo $(SOURCES) $(FORTH_GEN0) @KERNEL@ $(DOCDIST) $(BINONLYDIST)
 
 #makes a package with only the stuff not present in the source
 #package. For installation the source package is still needed!
@@ -94,5 +110,5 @@ dbinonlydist:	$(SOURCES) $(FORTH_GEN0) @
 		-$(RMTREE) gforth-$(VERSION)
 		mkdir gforth-$(VERSION)
 		$(TAR) $(BINONLYDIST) | (cd gforth-$(VERSION); tar xf -)
-		strip gforth-$(VERSION)/gforth
-		$(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION)-binonly-@host@.tar.gz
+		$(STRIP) gforth-$(VERSION)/gforth$(EXE)
+		$(TAR) gforth-$(VERSION)|gzip -9 >gforth-$(VERSION).binonly.@host@.tar.gz