summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/mingw-runtime/ChangeLog7
-rw-r--r--dev-util/mingw-runtime/files/mingw-runtime-3.12-DESTDIR.patch10
2 files changed, 11 insertions, 6 deletions
diff --git a/dev-util/mingw-runtime/ChangeLog b/dev-util/mingw-runtime/ChangeLog
index d5b165ea641f..ebb96519ad33 100644
--- a/dev-util/mingw-runtime/ChangeLog
+++ b/dev-util/mingw-runtime/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/mingw-runtime
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.12 2008/09/08 02:50:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.13 2008/09/17 09:36:52 vapier Exp $
+
+ 17 Sep 2008; Mike Frysinger <vapier@gentoo.org>
+ files/mingw-runtime-3.12-DESTDIR.patch:
+ Tweak patch to apply nicely to multiple mingw versions #237085 by Richard
+ Li.
*mingw-runtime-3.15 (08 Sep 2008)
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.12-DESTDIR.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.12-DESTDIR.patch
index bf31c9c248bf..f5c52ba6b1e2 100644
--- a/dev-util/mingw-runtime/files/mingw-runtime-3.12-DESTDIR.patch
+++ b/dev-util/mingw-runtime/files/mingw-runtime-3.12-DESTDIR.patch
@@ -1,17 +1,17 @@
--- Makefile.in
+++ Makefile.in
-@@ -58,6 +58,11 @@
- inst_libdir:=$(libdir)
- inst_docdir:=$(prefix)/doc/mingw-runtime
+@@ -58,5 +58,11 @@
endif
+
+inst_bindir:=$(DESTDIR)$(inst_bindir)
+inst_includedir:=$(DESTDIR)$(inst_includedir)
+inst_libdir:=$(DESTDIR)$(inst_libdir)
+inst_docdir:=$(DESTDIR)$(inst_docdir)
+mandir:=$(DESTDIR)$(mandir)
-
- # The Mingw headers are installed under a subdirectory of
++
+ # The Mingw headers are installed under a subdirectory of
# $(tooldir)/include when configuring in Cygwin.
+ HEADER_SUBDIR = @HEADER_SUBDIR@
@@ -199,6 +199,6 @@
all_dlls_host: $(DLLS)