From 60d4d42f4f97784b71b3777f7c3c36f1ebeb8738 Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sf.net>
Date: Mon, 25 Nov 2002 18:14:25 +0000
Subject: [PATCH] 	* lib/Makefile.in (dist, install): Correct the install
 destinations. 	* lib/ddk/Makefile.in (dist, install): Ditto.

---
 winsup/w32api/ChangeLog           |  5 +++++
 winsup/w32api/lib/Makefile.in     | 17 ++++++++++++-----
 winsup/w32api/lib/ddk/Makefile.in | 16 ++++++++--------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index de86807e8..fd2157ea9 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-25  Earnie Boyd  <earnie@users.sf.net>
+
+	* lib/Makefile.in (dist, install): Correct the install destinations.
+	* lib/ddk/Makefile.in (dist, install): Ditto.
+
 2002-11-16  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* lib/uuid.c (CATID_InternetAware,CLSID_HttpSProtocol,
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index 8e1a55188..fc33a5269 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -172,7 +172,7 @@ lib%.a: %.o
 	$(AR) rc $@ $*.o
 	$(RANLIB) $@
 
-.PHONY: install install-libraries install-headers install-pdk
+.PHONY: install install-libraries install-headers install-ddk
 # install headers and libraries in a target specified directory.
 install: install-libraries install-headers install-ddk
 
@@ -193,10 +193,10 @@ install-headers:
 	done
 
 install-ddk: install-libraries install-headers
-	(cd ddk; $(MAKE) install)
+	(cd ddk && $(MAKE) install $(FLAGS_TO_PASS) prefix=../$(prefix) exec_prefix=../$(exec_prefix))
 
 # uninstall headers and libraries from a target specified directory
-uninstall: uninstall-pdk uninstall-libraries uninstall-headers
+uninstall: uninstall-ddk uninstall-libraries uninstall-headers
 
 uninstall-libraries:
 	@for i in $(LIBS); do \
@@ -210,8 +210,8 @@ uninstall-headers:
 	done
 	rmdir $(inst_includedir)
 
-uninstall-pdk:
-	cd ddk && $(MAKE) -C uninstall
+uninstall-ddk:
+	cd ddk && $(MAKE) -C uninstall $(FLAGS_TO_PASS)
 
 dist:
 	mkdir $(distdir)/include
@@ -219,11 +219,18 @@ dist:
 	@for i in $(HEADERS); do \
 		cp -p $(srcdir)/../include/$$i $(distdir)/include/$$i ; \
 	done
+	mkdir $(distdir)/include/GL
+	@for i in $(GL_HEADERS); do \
+		cp -p $(srcdir)/../include/GL/$$i $(distdir)/include/GL/$$i ; \
+	done
 	mkdir $(distdir)/lib
 	chmod 755 $(distdir)/lib
 	@for i in $(DISTFILES); do \
 		cp -p $(srcdir)/$$i $(distdir)/lib/$$i ; \
 	done
+	for i in $(SUBDIRS); do \
+		(cd $$i; $(MAKE) distdir=../$(distdir) dist); \
+	done
 
 Makefile: Makefile.in ../config.status ../configure
 	cd ..; $(SHELL) config.status
diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in
index 9a335b567..fa2ebcff4 100644
--- a/winsup/w32api/lib/ddk/Makefile.in
+++ b/winsup/w32api/lib/ddk/Makefile.in
@@ -36,8 +36,8 @@ endif
 datadir = @datadir@
 infodir = @infodir@
 ifneq (,$(findstring cygwin,$(target_alias)))
-inst_includedir:=$(tooldir)/include/ddk
-inst_libdir:=$(tooldir)/lib
+inst_includedir:=$(tooldir)/include/w32api/ddk
+inst_libdir:=$(tooldir)/lib/w32api
 else
 inst_includedir:=$(includedir)/ddk
 inst_libdir:=$(libdir)
@@ -167,15 +167,15 @@ uninstall-headers:
 
 
 dist:
-	mkdir $(distdir)/include
-	chmod 755 $(distdir)/include
+	mkdir $(distdir)/include/ddk
+	chmod 755 $(distdir)/include/ddk
 	@for i in $(HEADERS); do \
-		cp -p $(srcdir)/../../ddk/include/$$i $(distdir)/include/ddk/$$i ; \
+		cp -p $(srcdir)/../../include/ddk/$$i $(distdir)/include/ddk/$$i ; \
 	done
-	mkdir $(distdir)/lib
-	chmod 755 $(distdir)/lib
+	mkdir $(distdir)/lib/ddk
+	chmod 755 $(distdir)/lib/ddk
 	@for i in $(DISTFILES); do \
-		cp -p $(srcdir)/$$i $(distdir)/lib/$$i ; \
+		cp -p $(srcdir)/$$i $(distdir)/lib/ddk/$$i ; \
 	done
 
 Makefile: Makefile.in ../../config.status ../../configure