summaryrefslogtreecommitdiff
path: root/package/xkeyboard-config/patches/patch-rules_Makefile_am
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-04 21:08:32 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-04 21:08:32 +0100
commitbce426f33b4619e49f8040b8f47a17d0772eb083 (patch)
tree6a6b6e1f34f13d045489abd14f4138feb56bb1cf /package/xkeyboard-config/patches/patch-rules_Makefile_am
parent76673934d3c65b7340089214d690aa996ced9239 (diff)
parent3466b70bbf4786274fe5c9028653264fb6239c4f (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xkeyboard-config/patches/patch-rules_Makefile_am')
-rw-r--r--package/xkeyboard-config/patches/patch-rules_Makefile_am10
1 files changed, 10 insertions, 0 deletions
diff --git a/package/xkeyboard-config/patches/patch-rules_Makefile_am b/package/xkeyboard-config/patches/patch-rules_Makefile_am
new file mode 100644
index 000000000..ac07e510b
--- /dev/null
+++ b/package/xkeyboard-config/patches/patch-rules_Makefile_am
@@ -0,0 +1,10 @@
+--- xkeyboard-config-2.11.orig/rules/Makefile.am 2013-12-17 23:59:06.000000000 +0100
++++ xkeyboard-config-2.11/rules/Makefile.am 2014-03-04 14:30:44.000000000 +0100
+@@ -244,4 +244,6 @@ MAINTAINERCLEANFILES = $(srcdir)/evdev.x
+ rulesdir = $(xkb_base)/rules
+ xmldir = $(rulesdir)
+
+-@INTLTOOL_XML_NOMERGE_RULE@
++# remove intltool-merge dependency
++%.xml: %.xml.in
++ cp $< $@