From c84242b6f3aecf3e25b54ad811030bcdf0188d00 Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sf.net>
Date: Wed, 22 Nov 2000 23:43:23 +0000
Subject: [PATCH] 	* Makefile.in: Fix bindist target to distribute the
 correct files. 	Remove the use of SNAPSHOT variable and test SNAPDATE
 instead. 	Set SNAPDATE within the snapshot target on recursive call to
 $(MAKE).

---
 winsup/mingw/ChangeLog   |  6 ++++++
 winsup/mingw/Makefile.in | 30 ++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index b53d38e47..6b802ade6 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-22  Earnie Boyd  <earnie_boyd@yahoo.com>
+
+	* Makefile.in: Fix bindist target to distribute the correct files.
+	Remove the use of SNAPSHOT variable and test SNAPDATE instead.
+	Set SNAPDATE within the snapshot target on recursive call to $(MAKE).
+
 2000-11-21  Earnie Boyd  <earnie_boyd@yahoo.com>
 
 	* Makefile.in: Add missing line continuation `\' for $(SUBDIRS) target.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 7f3a827ab..7b4070bb3 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -105,7 +105,16 @@ FLAGS_TO_PASS:=\
 	AR="$(AR)" \
 	RANLIB="$(RANLIB)" \
 	LD="$(LD)" \
-	DLLTOOL="$(DLLTOOL)"
+	DLLTOOL="$(DLLTOOL)" \
+	exec_prefix="$(exec_prefix)" \
+	bindir="$(bindir)" \
+	libdir="$(libdir)" \
+	tooldir="$(tooldir)" \
+	datadir="$(datadir)" \
+	infodir="$(infodir)" \
+	includedir="$(includedir)" \
+	prefix="$(prefix)" \
+	target_alias="$(target_alias)"
 
 CRT0S = crt$(CRT_ID).o dllcrt$(CRT_ID).o CRT_noglob.o crtmt.o crtst.o
 MINGW_OBJS = CRTglob.o CRTfmode.o CRTinit.o dirent.o dllmain.o gccmain.o \
@@ -210,7 +219,7 @@ distclean:
 	-rm -f config.cache config.status config.log 
 	-rm -f Makefile
 
-ifdef SNAPSHOT
+ifdef SNAPDATE
    distdir=$(PACKAGE)-$(VERSION)-$(SNAPDATE)
 else
    distdir=$(PACKAGE)-$(VERSION)
@@ -233,6 +242,7 @@ srcdist:
 	mkdir $(distdir)/include/sys
 	cp $(srcdir)/include/*.h $(distdir)/include/
 	cp $(srcdir)/include/sys/*.h $(distdir)/include/sys/
+#end FIXME
 	rm -f $(distdir)-src.tar.gz
 	$(TAR) czf $(distdir)-src.tar.gz $(distdir)
 
@@ -241,13 +251,21 @@ bindist:
 	rm -rf $(distdir)
 	mkdir $(distdir)
 	chmod 755 $(distdir)
-	$(MAKE) install prefix=../$(distdir)
+	$(MAKE) install prefix=$(shell pwd)/$(distdir)
 	rm -f $(distdir).tar.gz
-	cd $(distdir); $(TAR) czf ../$(distdir).tar.gz .
+#FIXME does the install process really need to install into the $(tooldir)? 
+	cd $(distdir) ; \
+	cd $(target_alias); \
+	for i in *; do \
+	   mv $$i ../; \
+        done; \
+	cd ..; \
+	rmdir $(target_alias); \
+	$(TAR) czf ../$(distdir).tar.gz *
+#end FIXME
 
-SNAPDATE = $(shell date '+%Y%m%d')
 snapshot: 
-	make dist SNAPSHOT=1
+	make dist SNAPDATE=$(shell date '+%Y%m%d')
 
 info: