summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@err.no>2007-06-18 22:03:46 +0200
committerTollef Fog Heen <tfheen@err.no>2007-06-18 22:03:46 +0200
commit1224c055d2e150d7e6d78ec85bbd30615cb9dd42 (patch)
tree5193a9a77092384136b7b88caa68a05a2661514b
parentcfd3a3dd1cadb6bafc2926bed2bbcd79253abc9a (diff)
* glib-patches/no-dist-distclean-files.diff: Fix prefix.
-rw-r--r--ChangeLog2
-rw-r--r--glib-patches/no-dist-distclean-files.diff4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index beb4091..8648779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
Also fix automake-warning.diff to not patch on top of another
patch from glib-patches.
+ * glib-patches/no-dist-distclean-files.diff: Fix prefix.
+
2007-05-30 Tor Lillqvist <tml@novell.com>
* parse.c: Fix problem on Win32 where the automagic prefix
diff --git a/glib-patches/no-dist-distclean-files.diff b/glib-patches/no-dist-distclean-files.diff
index 67173dc..be32e5e 100644
--- a/glib-patches/no-dist-distclean-files.diff
+++ b/glib-patches/no-dist-distclean-files.diff
@@ -4,8 +4,8 @@
Don't distribute DISTCLEAN files
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 2007-01-19 15:03:19.000000000 +0100
-+++ pkg-config-0.21/glib-1.2.8/Makefile.am 2007-01-19 15:07:29.000000000 +0100
+--- glib-1.2.8/Makefile.am 2007-01-19 15:03:19.000000000 +0100
++++ glib-1.2.8/Makefile.am 2007-01-19 15:07:29.000000000 +0100
@@ -23,9 +23,7 @@
makefile.msc.in \
makefile.msc \