diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-04-29 12:44:07 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-04-29 12:44:07 +0200 |
| commit | a8f5fa1d2e04f147f2b6d7f85cfd9985487e251b (patch) | |
| tree | ff65a56c92e61aec25ed765bc0539c378b725a3d /data/Makefile.am | |
| parent | 5d183bd65a42f46b030dc91f16c3087ddf509511 (diff) | |
| parent | 94b3317504dade2520f47e813c780f7e54a3ac2f (diff) | |
Merge tag 'upstream/3.17.1'
Upstream version 3.17.1
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 6 |
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) |