From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 18 Jun 2007 19:52:25 +0000 (+0200)
Subject: Fix path prefix so it applies.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ef3fc90d3a9ebe26a91301eb496adc69d366146;p=pkg-config

Fix path prefix so it applies.
---

diff --git a/ChangeLog b/ChangeLog
index a313a24..e993aec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-18  Tollef Fog Heen  <tfheen@err.no>
+
+	* glib-patches/autoconf-warning.diff,
+	glib-patches/automake-warning.diff Fix path prefix so it applies.
+
 2007-05-30  Tor Lillqvist  <tml@novell.com>
 
 	* parse.c: Fix problem on Win32 where the automagic prefix
diff --git a/glib-patches/autoconf-warning.diff b/glib-patches/autoconf-warning.diff
index 3965631..b626a0c 100644
--- a/glib-patches/autoconf-warning.diff
+++ b/glib-patches/autoconf-warning.diff
@@ -5,8 +5,8 @@
 		an AC_DEFINE in the second argument, where no actions should be taken
 
 diff -ur -x autom4te.cache -x aclocal.m4 -x configure -x Makefile.in -x config.h.in -x 'config.h.in~' pkg-config-0.21.orig/glib-1.2.8/configure.in pkg-config-0.21/glib-1.2.8/configure.in
---- pkg-config-0.21.orig/glib-1.2.8/configure.in	2006-08-16 20:24:29.000000000 +0200
-+++ pkg-config-0.21/glib-1.2.8/configure.in	2007-01-19 15:05:37.000000000 +0100
+--- glib-1.2.8/configure.in	2006-08-16 20:24:29.000000000 +0200
++++ glib-1.2.8/configure.in	2007-01-19 15:05:37.000000000 +0100
 @@ -384,11 +384,13 @@
  	  return realloc (0, sizeof (int)) == 0;
  	}],
diff --git a/glib-patches/automake-warning.diff b/glib-patches/automake-warning.diff
index 0608cc1..20a9638 100644
--- a/glib-patches/automake-warning.diff
+++ b/glib-patches/automake-warning.diff
@@ -6,8 +6,8 @@
 		whitespace following trailing backslash
 
 diff -ur -x autom4te.cache -x aclocal.m4 -x configure -x Makefile.in -x config.h.in -x 'config.h.in~' pkg-config-0.21.orig/glib-1.2.8/Makefile.am pkg-config-0.21/glib-1.2.8/Makefile.am
---- pkg-config-0.21.orig/glib-1.2.8/Makefile.am	2006-08-16 20:24:29.000000000 +0200
-+++ pkg-config-0.21/glib-1.2.8/Makefile.am	2007-01-19 15:03:19.000000000 +0100
+--- glib-1.2.8/Makefile.am	2006-08-16 20:24:29.000000000 +0200
++++ glib-1.2.8/Makefile.am	2007-01-19 15:03:19.000000000 +0100
 @@ -8,7 +8,7 @@
  configincludedir = $(pkglibdir)/include