aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/mbmerlin
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-16 12:03:53 -0700
committerTom Rini <tom_rini@mentor.com>2011-03-16 12:13:57 -0700
commite41ded5f413fdc54a526795c2a202484c2796b84 (patch)
tree4abc64b17ef1844c61f66fd7310a25a4e0745040 /recipes/mbmerlin
parent467575f6e24c425987b14f5b5f32bd0714926bb2 (diff)
downloadopenembedded-e41ded5f413fdc54a526795c2a202484c2796b84.tar.gz
In a large number of patches, remove unneeded '..' in paths.
In most cases we had both ../foopkg/foopkg as the first path and this simply became foopkg (the second path was already correct for the default strip level which is why the patch applies normally). In a few cases the second path was '.' which is valid but not as clear as 'b' (which is what git shows for example) so update that while we're at it. Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'recipes/mbmerlin')
-rw-r--r--recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch b/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch
index 0f2dabd8a3..561b221441 100644
--- a/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch
+++ b/recipes/mbmerlin/mbmerlin-0.8.1-2/fix_makefile.patch
@@ -1,5 +1,5 @@
-diff -urNd ../mbmerlin-0.8.1-2-r3/mbmerlin/Makefile mbmerlin/Makefile
---- ../mbmerlin-0.8.1-2-r3/mbmerlin/Makefile 2004-07-29 21:17:13.000000000 +0100
+diff -urNd mbmerlin/Makefile mbmerlin/Makefile
+--- mbmerlin/Makefile 2004-07-29 21:17:13.000000000 +0100
+++ mbmerlin/Makefile 2004-08-01 11:32:09.000000000 +0100
@@ -106,6 +106,7 @@
install mbmerlin.desktop $(DESTDIR)/usr/share/applications/inputmethods