diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | glib-patches/automake-warning.diff | 9 | ||||
| -rw-r--r-- | glib-patches/distcheckfix.diff | 2 |
3 files changed, 4 insertions, 10 deletions
@@ -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 20a9638..1586c54 100644 --- 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 d68b8fa..01e112c 100644 --- 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 |