[MinGW-cvs] CVS: w32api/lib Makefile.in,1.9,1.10

[Earnie B. <ea...@us...>]

Update of /cvsroot/mingw/w32api/lib
In directory usw-pr-cvs1:/tmp/cvs-serv29011/lib

Modified Files:
	Makefile.in 
Log Message:
Merge Cygwin differences

Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/w32api/lib/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.in	2001/12/03 20:08:37	1.9
--- Makefile.in	2002/01/25 00:59:17	1.10
***************
*** 20,24 ****
  target_alias = @target_alias@
  prefix = @prefix@
- config_prefix = @prefix@
  includedir:=@includedir@
  
--- 20,23 ----
***************
*** 38,57 ****
  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)/include/w32api
  inst_libdir:=$(tooldir)/lib/w32api
- endif
- else
- inst_includedir:=$(includedir)
- inst_libdir:=$(libdir)
- endif
  else
  inst_includedir:=$(includedir)
--- 37,43 ----