summaryrefslogtreecommitdiff
path: root/glib-patches
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@err.no>2007-06-18 22:01:32 +0200
committerTollef Fog Heen <tfheen@err.no>2007-06-18 22:01:32 +0200
commitcfd3a3dd1cadb6bafc2926bed2bbcd79253abc9a (patch)
treef32fccfb1ddabdb8bb27073d9fb8d6354d2b68dc /glib-patches
parent4ef3fc90d3a9ebe26a91301eb496adc69d366146 (diff)
downloadpkg-config-cfd3a3dd1cadb6bafc2926bed2bbcd79253abc9a.tar.gz
Fix automake-warning.diff to not patch on top of another patch from
glib-patches.
Diffstat (limited to 'glib-patches')
-rw-r--r--glib-patches/automake-warning.diff9
-rw-r--r--glib-patches/distcheckfix.diff2
2 files changed, 1 insertions, 10 deletions
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