diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2001-09-17 20:15:54 +0400 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2001-09-17 20:15:54 +0400 |
| commit | 3e985c99c07bfdea2fb4cabe2662f64fe54c4a7b (patch) | |
| tree | 02ad44bb601eb9234966a22701949f504610cab3 | |
| parent | f244c34bae8073e67e19f2a3e5e7035ec391dda3 (diff) | |
2001-09-17 Earnie Boyd <earnie@sf.net>
* lib/Makefile.in (inst_includedir): Add FIXME and remove the usr/
portion of the directory from the install.
(inst_libdir): Ditto.
* Makefile.in (VERSION): Increment.
* include/w32api.h: Increment version.
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/Makefile.in | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/w32api.h | 4 | ||||
| -rw-r--r-- | winsup/w32api/lib/Makefile.in | 7 |
4 files changed, 16 insertions, 5 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index b0e7f4642..812bec8f4 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2001-09-17 Earnie Boyd <earnie@sf.net> + + * lib/Makefile.in (inst_includedir): Add FIXME and remove the usr/ + portion of the directory from the install. + (inst_libdir): Ditto. + * Makefile.in (VERSION): Increment. + * include/w32api.h: Increment version. + 2001-09-13 Earnie Boyd <earnie@SF.net> * lib/Makefile.in (inst_includedir): Change to always use w32api diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in index 7588a2524..fd877b9d0 100644 --- a/winsup/w32api/Makefile.in +++ b/winsup/w32api/Makefile.in @@ -65,7 +65,7 @@ FLAGS_TO_PASS = \ SUBDIRS = lib PACKAGE = w32api -VERSION = 1.1 +VERSION = 1.2 CYGRELEASE = 1 DIST_FILES = Makefile.in configure.in configure config.guess config.sub \ diff --git a/winsup/w32api/include/w32api.h b/winsup/w32api/include/w32api.h index a237d14d6..9717dbc21 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.1 +#define __W32API_VERSION 1.2 #define __W32API_MAJOR_VERSION 1 -#define __W32API_MINOR_VERSION 1 +#define __W32API_MINOR_VERSION 2 #endif /* ndef _W32API_H_ */ diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index 593dabbd5..9dda86b0e 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -37,14 +37,17 @@ tooldir:=$(exec_prefix)/$(target_alias) endif datadir = @datadir@ infodir = @infodir@ +#FIXME. The inst_includedir and inst_libdir need to be modified to use +#$(tooldir)/usr/include/w32api and $(tooldir)/usr/lib/w32api for the dist +#targets. ifneq (,$(findstring cygwin,$(target_alias))) ifeq ($(build_alias),$(host_alias)) ifeq ($(prefix),$(config_prefix)) inst_includedir:=$(tooldir)/include/w32api inst_libdir:=$(tooldir)/lib/w32api else -inst_includedir:=$(tooldir)/usr/include/w32api -inst_libdir:=$(tooldir)/usr/lib/w32api +inst_includedir:=$(tooldir)/include/w32api +inst_libdir:=$(tooldir)/lib/w32api endif else inst_includedir:=$(includedir) |