* lib/Makefile.in: Install headers and libraries in tooldir.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index c1b763c1d46fee4b1e1dbc5318cd2927ecae6e7c..123ef8bb275563b379000b375d57f0c123a8f11e 100644 (file)
--- 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 1293b01906bcaf0dd3e41e38d681e9b9ce7a3169..077f3cef999aca3c62b95ab390af7018dfaef30a 100644 (file)
--- 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