Fix automake-warning.diff to not patch on top of another patch from

glib-patches.

diff --git a/ChangeLog b/ChangeLog
index e993aec51c4a744e79fd059c077ae3ad90febb6c..beb409103592093f48cf2970b463be52becf780b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
        * glib-patches/autoconf-warning.diff,
        glib-patches/automake-warning.diff Fix path prefix so it applies.
 
+       Also fix automake-warning.diff to not patch on top of another
+       patch from glib-patches.
+
 2007-05-30  Tor Lillqvist  <tml@novell.com>
 
        * parse.c: Fix problem on Win32 where the automagic prefix

diff --git a/glib-patches/automake-warning.diff b/glib-patches/automake-warning.diff
index 20a9638f11d44de370f00c657347c2948597c931..1586c5490e1f2264ba0f80da3d2b3704f6445476 100644 (file)
--- a/glib-patches/automake-warning.diff
+++ b/glib-patches/automake-warning.diff
@@ -28,12 +28,3 @@ diff -ur -x autom4te.cache -x aclocal.m4 -x configure -x Makefile.in -x config.h
  
  CONFIGURE_DEPENDENCIES = acglib.m4            
  
-@@ -121,7 +121,7 @@
-       fi \
-       && cp glib.spec $(distdir)
- 
--DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h glibconfig.h.win32 \ 
-+DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h glibconfig.h.win32 \
-                config.h.win32
- 
- CLEANFILES = stamp-gc-h  makefile.msc

diff --git a/glib-patches/distcheckfix.diff b/glib-patches/distcheckfix.diff
index d68b8fa77f80ad7bc665668c62dfe9a9ff278951..01e112c7fca6e56ebd4b05bfdc8613177460c5e1 100644 (file)
--- a/glib-patches/distcheckfix.diff
+++ b/glib-patches/distcheckfix.diff
@@ -13,7 +13,7 @@
        fi \
        && cp glib.spec $(distdir)
 +
-+DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h glibconfig.h.win32 \ 
++DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h glibconfig.h.win32 \
 +               config.h.win32
 +
 +CLEANFILES = stamp-gc-h  makefile.msc