Fix path prefix so it applies.

diff --git a/ChangeLog b/ChangeLog
index a313a24cc7f8883150b5f21660cdf8031cb9ad2d..e993aec51c4a744e79fd059c077ae3ad90febb6c 100644 (file)
--- 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 396563183bd8fe3b28d2fb6b20d57def482e4856..b626a0c2860317cc7b4f16c7af9126ac927426e1 100644 (file)
--- 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 0608cc1486668d3f22420858d60f37c0ce866091..20a9638f11d44de370f00c657347c2948597c931 100644 (file)
--- 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