diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-08-30 13:04:41 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-08-30 13:04:41 +0000 |
| commit | fc0256b600469d55d4feb37c97f9c1bca022b474 (patch) | |
| tree | 719bd34954f775445d43e8428fae2c779a1937b8 /winsup/w32api/lib | |
| parent | 9e8b8cdb9f0abf0ad299c6a8ed63b76ae6bec171 (diff) | |
| download | cygnal-fc0256b600469d55d4feb37c97f9c1bca022b474.tar.gz cygnal-fc0256b600469d55d4feb37c97f9c1bca022b474.tar.bz2 cygnal-fc0256b600469d55d4feb37c97f9c1bca022b474.zip | |
* configure.in: Substitute with_cross_host in depending files.
* configure: Regenerate.
* lib/Makefile.in: Add with_cross_host to allow more granular checks.
Set installation directories accordingly.
* lib/ddk/Makefile.in: Ditto.
* lib/directx/Makefile.in: Ditto.
Diffstat (limited to 'winsup/w32api/lib')
| -rw-r--r-- | winsup/w32api/lib/Makefile.in | 6 | ||||
| -rw-r--r-- | winsup/w32api/lib/ddk/Makefile.in | 6 | ||||
| -rw-r--r-- | winsup/w32api/lib/directx/Makefile.in | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index b678d2b1f..1127fb227 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -21,6 +21,7 @@ subdirs := ddk directx host_alias = @host@ build_alias = @build@ target_alias = @target@ +with_cross_host = @with_cross_host@ prefix = @prefix@ includedir:=@includedir@ @@ -43,9 +44,14 @@ ifneq (,$(findstring cygwin,$(target_alias))) inst_includedir:=$(tooldir)/include/w32api inst_libdir:=$(tooldir)/lib/w32api else +ifneq (,$with_cross_host) +inst_includedir:=$(tooldir)/include/w32api +inst_libdir:=$(tooldir)/lib +else inst_includedir:=$(includedir) inst_libdir:=$(libdir) endif +endif INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in index fa2ebcff4..c7c5cdde7 100644 --- a/winsup/w32api/lib/ddk/Makefile.in +++ b/winsup/w32api/lib/ddk/Makefile.in @@ -17,6 +17,7 @@ VPATH = @srcdir@ host_alias = @host@ build_alias = @build@ target_alias = @target@ +with_cross_host = @with_cross_host@ prefix = @prefix@ includedir:=@includedir@ @@ -39,9 +40,14 @@ ifneq (,$(findstring cygwin,$(target_alias))) inst_includedir:=$(tooldir)/include/w32api/ddk inst_libdir:=$(tooldir)/lib/w32api else +ifneq (,$with_cross_host) +inst_includedir:=$(tooldir)/include/w32api/ddk +inst_libdir:=$(tooldir)/lib +else inst_includedir:=$(includedir)/ddk inst_libdir:=$(libdir) endif +endif INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/winsup/w32api/lib/directx/Makefile.in b/winsup/w32api/lib/directx/Makefile.in index 042cae0ed..1d1074285 100644 --- a/winsup/w32api/lib/directx/Makefile.in +++ b/winsup/w32api/lib/directx/Makefile.in @@ -17,6 +17,7 @@ VPATH = @srcdir@ host_alias = @host@ build_alias = @build@ target_alias = @target@ +with_cross_host = @with_cross_host@ prefix = @prefix@ includedir:=@includedir@ @@ -39,9 +40,14 @@ ifneq (,$(findstring cygwin,$(target_alias))) inst_includedir:=$(tooldir)/include/w32api inst_libdir:=$(tooldir)/lib/w32api else +ifneq (,$with_cross_host) +inst_includedir:=$(tooldir)/include/w32api +inst_libdir:=$(tooldir)/lib +else inst_includedir:=$(includedir) inst_libdir:=$(libdir) endif +endif INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ |