2001-09-13 Earnie Boyd <earnie@SF.net>
* lib/Makefile.in (config_prefix): New variable. (inst_includedir): Manipulate special value only if target == cygwin and build == target and prefix != config_prefix. (inst_libdir): Ditto.
This commit is contained in:
		| @@ -1,3 +1,10 @@ | |||||||
|  | 2001-09-13  Earnie Boyd  <earnie@SF.net> | ||||||
|  |  | ||||||
|  | 	* lib/Makefile.in (config_prefix): New variable. | ||||||
|  | 	(inst_includedir): Manipulate special value only if target == cygwin | ||||||
|  | 	and build == target and prefix != config_prefix. | ||||||
|  | 	(inst_libdir): Ditto. | ||||||
|  |  | ||||||
| 2001-09-12  Earnie Boyd  <earnie@SF.net> | 2001-09-12  Earnie Boyd  <earnie@SF.net> | ||||||
|  |  | ||||||
| 	* Makefile.in (TARFLAGS): New variable. | 	* Makefile.in (TARFLAGS): New variable. | ||||||
|   | |||||||
| @@ -19,6 +19,7 @@ host_alias = @host_alias@ | |||||||
| build_alias = @build_alias@ | build_alias = @build_alias@ | ||||||
| target_alias = @target_alias@ | target_alias = @target_alias@ | ||||||
| prefix = @prefix@ | prefix = @prefix@ | ||||||
|  | config_prefix = @prefix@ | ||||||
| includedir:=@includedir@ | includedir:=@includedir@ | ||||||
|  |  | ||||||
| program_transform_name = @program_transform_name@ | program_transform_name = @program_transform_name@ | ||||||
| @@ -37,8 +38,18 @@ endif | |||||||
| datadir = @datadir@ | datadir = @datadir@ | ||||||
| infodir = @infodir@ | infodir = @infodir@ | ||||||
| ifneq (,$(findstring cygwin,$(target_alias))) | ifneq (,$(findstring cygwin,$(target_alias))) | ||||||
|  | ifeq ($(build_alias),$(host_alias)) | ||||||
|  | ifeq ($(prefix),$(config_prefix)) | ||||||
|  | inst_includedir:=$(includedir) | ||||||
|  | inst_libdir:=$(libdir) | ||||||
|  | else | ||||||
| inst_includedir:=$(tooldir)/usr/include/w32api | inst_includedir:=$(tooldir)/usr/include/w32api | ||||||
| inst_libdir:=$(tooldir)/usr/lib/w32api | inst_libdir:=$(tooldir)/usr/lib/w32api | ||||||
|  | endif | ||||||
|  | else | ||||||
|  | inst_includedir:=$(includedir) | ||||||
|  | inst_libdir:=$(libdir) | ||||||
|  | endif | ||||||
| else | else | ||||||
| inst_includedir:=$(includedir) | inst_includedir:=$(includedir) | ||||||
| inst_libdir:=$(libdir) | inst_libdir:=$(libdir) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user