* lib/Makefile.in: Install header files in w32api subdirectory.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 79f6ec2..0aa98ba 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov  3 21:50:47 2000  Christopher Faylor <cgf@cygnus.com>
+
+       * lib/Makefile.in: Install header files in w32api subdirectory.
+
 2000-10-31  Earnie Boyd  <earnie_boyd@yahoo.com>
 
        * CONTRIBUTIONS: New file.

diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index 7e79471..8fdd383 100644 (file)
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -134,9 +134,10 @@ xinstall-libraries: all
        done
 
 xinstall-headers:
-       $(mkinstalldirs) $(tooldir)/include
+       $(mkinstalldirs) $(tooldir)/include/w32api
        for i in $(HEADERS); do \
-               $(INSTALL_DATA) $(srcdir)/../include/$$i $(tooldir)/include/$$i ; \
+               $(INSTALL_DATA) $(srcdir)/../include/$$i $(tooldir)/include/w32api/$$i ; \
+               echo "#include <w32api/$$i>" > $(tooldir)/include/$$i ; \
        done
 
 # uninstall headers and libraries from a target specified directory
@@ -162,9 +163,10 @@ install-libraries: all
        done
 
 install-headers:
-       $(mkinstalldirs) $(exec_prefix)/include
+       $(mkinstalldirs) $(exec_prefix)/include/w32api
        for i in $(HEADERS); do \
-               $(INSTALL_DATA) $(srcdir)/../include/$$i $(exec_prefix)/include/$$i ; \
+               $(INSTALL_DATA) $(srcdir)/../include/$$i $(exec_prefix)/include/w32api/$$i ; \
+               echo "#include <w32api/$$i>" > $(exec_prefix)/include/$$i ; \
        done
 
 # uninstall headers and libraries