summaryrefslogtreecommitdiff
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-21 06:24:54 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-21 06:24:54 +0200
commit2d3786309780c22628c7e9d9ce4d6db97c437026 (patch)
treeb0705e10a7d8b77216cde0c757447b1234f9d095 /data/Makefile.am
parent7180d98f3a1b400efb6060e88d9f27bdc24184bf (diff)
parent53ff7b09f2995edfbd52b9789fe2dfe015e6c4a3 (diff)
Merge tag 'upstream/3.17.1.1'
Upstream version 3.17.1.1
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am9
1 files changed, 2 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 6d68e8e..92af82f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,12 +1,9 @@
-SUBDIRS = icons
+SUBDIRS = icons appdata
desktopdir = $(datadir)/applications
desktop_DATA = simple-scan.desktop
@INTLTOOL_DESKTOP_RULE@
-
-appdatadir = $(datadir)/appdata
-appdata_DATA = simple-scan.appdata.xml
-@INTLTOOL_XML_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
@GSETTINGS_RULES@
@@ -14,7 +11,6 @@ gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
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
@@ -23,5 +19,4 @@ DISTCLEANFILES = \
Makefile.in \
$(schema_DATA) \
$(desktop_DATA) \
- $(appdata_DATA) \
$(gsettings_SCHEMAS)