* Makefile.in: Semi-revert 2006-08-30 change.

This commit is contained in:
Christopher Faylor 2006-09-11 16:06:35 +00:00
parent 08b5122764
commit c48cea17a8
2 changed files with 4 additions and 7 deletions

View File

@ -1,3 +1,7 @@
2006-09-11 Christopher Faylor <cgf@timesys.com>
* Makefile.in: Semi-revert 2006-08-30 change.
2006-09-10 Danny Smith <dannysmith@users.sourceforge.net> 2006-09-10 Danny Smith <dannysmith@users.sourceforge.net>
* include/_mingw.h (__MINGW_ATTRIB_DEPRECATED): Define. * include/_mingw.h (__MINGW_ATTRIB_DEPRECATED): Define.

View File

@ -54,18 +54,11 @@ inst_includedir:=$(tooldir)/include/mingw
inst_libdir:=$(tooldir)/lib/mingw inst_libdir:=$(tooldir)/lib/mingw
inst_docdir:=$(tooldir)/share/doc/mingw-runtime inst_docdir:=$(tooldir)/share/doc/mingw-runtime
else else
ifneq (,$with_cross_host)
inst_bindir:=$(tooldir)/bin
inst_includedir:=$(tooldir)/include
inst_libdir:=$(tooldir)/lib
inst_docdir:=$(tooldir)/share/doc/mingw-runtime
else
inst_bindir:=$(bindir) inst_bindir:=$(bindir)
inst_includedir:=$(includedir) inst_includedir:=$(includedir)
inst_libdir:=$(libdir) inst_libdir:=$(libdir)
inst_docdir:=$(prefix)/doc/mingw-runtime inst_docdir:=$(prefix)/doc/mingw-runtime
endif endif
endif
# The Mingw headers are installed under a subdirectory of # The Mingw headers are installed under a subdirectory of
# $(tooldir)/include when configuring in Cygwin. # $(tooldir)/include when configuring in Cygwin.