From 5a4b4ab9cccd3f81796555c0e5e508ce800f713a Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sf.net>
Date: Mon, 12 Feb 2001 19:45:33 +0000
Subject: 	* lib/Makefile.in: (host_alias): Add variable. 	(host_build):
 Ditto: 	(xinstall): Removed 	(xinstall-libraries): Ditto. 
 (xinstall-headers): Ditto. 	(xuninstall): Ditto. 
 (xuninstall-libraries): Ditto. 	(xuninstall-headers): Ditto. 	*
 Makefile.in: (host_alias): Add variable. 	(build_alias): Ditto.

---
 winsup/w32api/ChangeLog       | 13 +++++++++++++
 winsup/w32api/Makefile.in     |  2 ++
 winsup/w32api/lib/Makefile.in | 36 +++++-------------------------------
 3 files changed, 20 insertions(+), 31 deletions(-)

(limited to 'winsup/w32api')

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 218515e04..8f058562b 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,4 +1,17 @@
 
+2001-02-12:  Earnie Boyd  <earnie@users.sourceforge.net>
+
+	* lib/Makefile.in: (host_alias): Add variable.
+	(host_build): Ditto:
+	(xinstall): Removed
+	(xinstall-libraries): Ditto.
+	(xinstall-headers): Ditto.
+	(xuninstall): Ditto.
+	(xuninstall-libraries): Ditto.
+	(xuninstall-headers): Ditto.
+	* Makefile.in: (host_alias): Add variable.
+	(build_alias): Ditto.
+
 Fri Feb  2 13:08:09  2001  Earnie Boyd  <earnie@users.sourceforge.net>
 
 	* include/winnt.h: (__TEXT): Add private macro.
diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index 2d86a0f8e..baab75016 100644
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -14,6 +14,8 @@ SHELL = @SHELL@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+build_alias = @build_alias@
+host_alias = @host_alias@
 target_alias = @target_alias@
 prefix = @prefix@
 
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index c2af26e4f..6749b4e52 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -15,6 +15,8 @@ SHELL = @SHELL@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+host_alias = @host_alias@
+build_alias = @build_alias@
 target_alias = @target_alias@
 prefix = @prefix@
 
@@ -133,35 +135,6 @@ lib%.a: %.o
 	$(RANLIB) $@
 
 # install headers and libraries in a target specified directory.
-xinstall: xinstall-libraries xinstall-headers
-
-xinstall-libraries: all
-	$(mkinstalldirs) $(tooldir)/lib
-	for i in $(LIBS); do \
-		$(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \
-	done
-
-xinstall-headers:
-	$(mkinstalldirs) $(tooldir)/include/w32api
-	for i in $(HEADERS); do \
-		$(INSTALL_DATA) $(srcdir)/../include/$$i $(tooldir)/include/w32api/$$i ; \
-	done
-
-# uninstall headers and libraries from a target specified directory
-xuninstall: xuninstall-libraries xuninstall-headers
-
-xuninstall-libraries:
-	@for i in $(LIBS); do \
-		rm -f $(tooldir)/lib/$$i ; \
-	done
-
-xuninstall-headers:
-	@for i in $(HEADERS); do \
-		rm -r $(tooldir)/include/w32api/$$i ; \
-	done
-	rmdir $(tooldir)/include/w32api
-
-# install headers and libraries 
 install: install-libraries install-headers
 
 install-libraries: all
@@ -176,7 +149,7 @@ install-headers:
 		$(INSTALL_DATA) $(srcdir)/../include/$$i $(tooldir)/include/w32api/$$i ; \
 	done
 
-# uninstall headers and libraries 
+# uninstall headers and libraries from a target specified directory
 uninstall: uninstall-libraries uninstall-headers
 
 uninstall-libraries:
@@ -186,10 +159,11 @@ uninstall-libraries:
 
 uninstall-headers:
 	@for i in $(HEADERS); do \
-		rm -f $(tooldir)/include/w32api/$$i ; \
+		rm -r $(tooldir)/include/w32api/$$i ; \
 	done
 	rmdir $(tooldir)/include/w32api
 
+
 dist:
 	mkdir $(distdir)/include
 	chmod 755 $(distdir)/include
-- 
cgit v1.2.3