From c88bb51c3ca08f1cf79dd0215ff5f46817267ddb Mon Sep 17 00:00:00 2001
From: Earnie Boyd <earnie@users.sf.net>
Date: Wed, 12 Sep 2001 14:48:07 +0000
Subject: [PATCH] 2001-09-12  Earnie Boyd  <earnie@SF.net>

	* Makefile.in: Increment version.
	* include/w32api.h: Ditto.
	* lib/Makefile.in: Add usr/ to install directory special for cygwin.
---
 winsup/w32api/ChangeLog        | 6 ++++++
 winsup/w32api/Makefile.in      | 9 +++++++--
 winsup/w32api/include/w32api.h | 4 ++--
 winsup/w32api/lib/Makefile.in  | 4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 791c90b2e..942d8b843 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-12  Earnie Boyd  <earnie@SF.net>
+
+	* Makefile.in: Increment version.
+	* include/w32api.h: Ditto.
+	* lib/Makefile.in: Add usr/ to install directory special for cygwin.
+
 2001-09-11  Danny Smith  <dannysmith@users.sourceforge.net>
 
  	* include/winnt.h (_[U]LARGE_INTEGER): Protect nameless struct with
diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index 9c175e200..ddb1acdc6 100644
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -60,7 +60,8 @@ FLAGS_TO_PASS = \
 SUBDIRS = lib
 
 PACKAGE = w32api
-VERSION = 1.0
+VERSION = 1.1
+CYGRELEASE = 1
 
 DIST_FILES = Makefile.in configure.in configure config.guess config.sub \
 install-sh README ChangeLog TODO CONTRIBUTIONS
@@ -86,7 +87,11 @@ install uninstall:
 ifdef SNAPDATE
     distdir = $(PACKAGE)-$(VERSION)-$(SNAPDATE)
 else
-    distdir = $(PACKAGE)-$(VERSION)
+   ifneq (,$(findstring cygwin, $(target_alias)))
+      distdir=$(PACKAGE)-$(VERSION)-$(CYGRELEASE)
+   else
+      distdir=$(PACKAGE)-$(VERSION)
+   endif
 endif
 
 dist: srcdist bindist
diff --git a/winsup/w32api/include/w32api.h b/winsup/w32api/include/w32api.h
index dbcfeac02..a237d14d6 100644
--- a/winsup/w32api/include/w32api.h
+++ b/winsup/w32api/include/w32api.h
@@ -1,8 +1,8 @@
 #ifndef _W32API_H_
 #define _W32API_H_
 
-#define __W32API_VERSION 1.0
+#define __W32API_VERSION 1.1
 #define __W32API_MAJOR_VERSION 1
-#define __W32API_MINOR_VERSION 0
+#define __W32API_MINOR_VERSION 1
 
 #endif /* ndef _W32API_H_ */
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index 0c06a3a30..a7ec2e2f0 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -37,8 +37,8 @@ endif
 datadir = @datadir@
 infodir = @infodir@
 ifneq (,$(findstring cygwin,$(target_alias)))
-inst_includedir:=$(tooldir)/include/w32api
-inst_libdir:=$(tooldir)/lib/w32api
+inst_includedir:=$(tooldir)/usr/include/w32api
+inst_libdir:=$(tooldir)/usr/lib/w32api
 else
 inst_includedir:=$(includedir)
 inst_libdir:=$(libdir)