From 1ec64aab9b6eb86e002b9e5bc8883e08c6159035 Mon Sep 17 00:00:00 2001 From: infirit Date: Wed, 10 Dec 2014 18:14:05 +0100 Subject: Use the NOMERGE rule for now It causes problems in the gsettings schema. --- data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Makefile.am b/data/Makefile.am index 5e5473a3..fedca7dd 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -50,7 +50,7 @@ endif # # App data file # -@INTLTOOL_XML_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ appdatadir = $(datadir)/appdata appdata_in_files = atril.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) -- cgit v1.2.1