Merging MinGW changes

diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index 764653b..b9c878b 100644 (file)
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -67,7 +67,7 @@ SUBDIRS = lib
 
 PACKAGE = w32api
 VERSION = 1.4
-CYGRELEASE = 1
+CYGRELEASE = 2
 
 DIST_FILES = Makefile.in configure.in configure config.guess config.sub \
 install-sh README ChangeLog TODO CONTRIBUTIONS

diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index ddb0d82..a577ab1 100644 (file)
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -87,6 +87,7 @@ LD = @LD@
 # headers
 
 HEADERS = $(notdir $(wildcard $(srcdir)/../include/*.h))
+GL_HEADERS = $(notdir $(wildcard $(srcdir)/../include/GL/*.h))
 
 # libraries
 
@@ -158,6 +159,10 @@ install-headers:
        for i in $(HEADERS); do \
                $(INSTALL_DATA) $(srcdir)/../include/$$i $(inst_includedir)/$$i ; \
        done
+       $(mkinstalldirs) $(inst_includedir)/GL
+       for i in $(GL_HEADERS); do \
+               $(INSTALL_DATA) $(srcdir)/../include/GL/$$i $(inst_includedir)/GL/$$i ; \
+       done
 
 # uninstall headers and libraries from a target specified directory
 uninstall: uninstall-libraries uninstall-headers