summaryrefslogtreecommitdiff
path: root/package/xkeyboard-config/patches/patch-rules_Makefile_am
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-05 12:54:21 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-05 12:54:21 +0100
commit47700fbf1cafdcb6b697ecb02f11363173e6b008 (patch)
tree5d4c104d81f7fe43d380c97fec2bdd53f84cc9fa /package/xkeyboard-config/patches/patch-rules_Makefile_am
parentf48a3ede4e7b99a0a58262a88b632ee01d7d3a0a (diff)
parent7e783125e4ba1ad319febf468e2e6e90e4c0ff42 (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 $< $@