summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-12-10 18:14:05 +0100
committerinfirit <[email protected]>2014-12-10 18:14:05 +0100
commit1ec64aab9b6eb86e002b9e5bc8883e08c6159035 (patch)
tree7581d5fbe5c89bdc2f194b1c9e539d4d0e0ed1ae
parent921a0c368f10d7e850364a3a39b82bfff6f738cd (diff)
downloadatril-1ec64aab9b6eb86e002b9e5bc8883e08c6159035.tar.bz2
atril-1ec64aab9b6eb86e002b9e5bc8883e08c6159035.tar.xz
Use the NOMERGE rule for now
It causes problems in the gsettings schema.
-rw-r--r--data/Makefile.am2
1 files changed, 1 insertions, 1 deletions
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)