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.
This commit is contained in:
Earnie Boyd 2001-09-17 16:15:54 +00:00
parent f244c34bae
commit 3e985c99c0
4 changed files with 16 additions and 5 deletions

View file

@ -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

View file

@ -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 \

View file

@ -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_ */

View file

@ -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)