summaryrefslogtreecommitdiff
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-29 12:43:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-29 12:43:58 +0200
commit94b3317504dade2520f47e813c780f7e54a3ac2f (patch)
tree2cf1f08c9a89a8e490efa7a4071b9b44de83bbdf /data/Makefile.am
parent2fb926c2bb3fd45a2d1428db6a44ce9da8b9a85d (diff)
Imported Upstream version 3.17.1upstream/3.17.1
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index b436f12..6d68e8e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,15 +5,16 @@ desktop_DATA = simple-scan.desktop
@INTLTOOL_DESKTOP_RULE@
appdatadir = $(datadir)/appdata
-dist_appdata_DATA = simple-scan.appdata.xml
+appdata_DATA = simple-scan.appdata.xml
+@INTLTOOL_XML_RULE@
gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
-@INTLTOOL_XML_NOMERGE_RULE@
@GSETTINGS_RULES@
dist_man1_MANS = simple-scan.1
EXTRA_DIST = simple-scan.desktop.in \
+ simple-scan.appdata.xml.in \
org.gnome.SimpleScan.gschema.xml.in \
simple-scan.ui \
simple-scan.gresource.xml
@@ -22,4 +23,5 @@ DISTCLEANFILES = \
Makefile.in \
$(schema_DATA) \
$(desktop_DATA) \
+ $(appdata_DATA) \
$(gsettings_SCHEMAS)