From 772231a0550283e1fa78bfc3cf3bc49014c0e239 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 11 Dec 2000 18:14:15 +0000
Subject: [PATCH] * lib/Makefile.in: Install headers and libraries in tooldir.

---
 winsup/w32api/ChangeLog       |  4 ++++
 winsup/w32api/lib/Makefile.in | 26 +++++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index c1b763c1d..123ef8bb2 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 11 13:11:36 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* lib/Makefile.in: Install headers and libraries in tooldir.
+
 2000-12-04  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
 
 	* include/winnls.h: NORM_IGNORE* remove duplicate defines. 
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index 1293b0190..077f3cef9 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -22,7 +22,15 @@ program_transform_name = @program_transform_name@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
+ifeq ($(target_alias),$(host_alias))
+ifeq ($(build_alias),$(host_alias))
+tooldir:=$(exec_prefix)
+else
+tooldir:=$(exec_prefix)/$(target_alias)
+endif
+else
+tooldir:=$(exec_prefix)/$(target_alias)
+endif
 datadir = @datadir@
 infodir = @infodir@
 includedir = @includedir@
@@ -158,16 +166,16 @@ xuninstall-headers:
 install: install-libraries install-headers
 
 install-libraries: all
-	$(mkinstalldirs) $(exec_prefix)/lib
+	$(mkinstalldirs) $(tooldir)/lib
 	for i in $(LIBS); do \
-		$(INSTALL_DATA) $$i $(exec_prefix)/lib/$$i ; \
+		$(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \
 	done
 
 install-headers:
-	$(mkinstalldirs) $(exec_prefix)/include/w32api
+	$(mkinstalldirs) $(tooldir)/include/w32api
 	for i in $(HEADERS); do \
-		$(INSTALL_DATA) $(srcdir)/../include/$$i $(exec_prefix)/include/w32api/$$i ; \
-		echo "#include <w32api/$$i>" > $(exec_prefix)/include/$$i ; \
+		$(INSTALL_DATA) $(srcdir)/../include/$$i $(tooldir)/include/w32api/$$i ; \
+		echo "#include <w32api/$$i>" > $(tooldir)/include/$$i ; \
 	done
 
 # uninstall headers and libraries 
@@ -175,14 +183,14 @@ uninstall: uninstall-libraries uninstall-headers
 
 uninstall-libraries:
 	@for i in $(LIBS); do \
-		rm -f $(exec_prefix)/lib/$$i ; \
+		rm -f $(tooldir)/lib/$$i ; \
 	done
 
 uninstall-headers:
 	@for i in $(HEADERS); do \
-		rm -f $(exec_prefix)/include/w32api/$$i ; \
+		rm -f $(tooldir)/include/w32api/$$i ; \
 	done
-	rmdir $(exec_prefix)/include/w32api
+	rmdir $(tooldir)/include/w32api
 
 dist:
 	mkdir $(distdir)/include