Commit 2638d50b authored by Daniel Espinosa Ortiz's avatar Daniel Espinosa Ortiz

Merge branch 'fix-appstream' into 'master'

Change dir for the appdata.xml to metainfo

See merge request !82
parents 82cb8805 4b005b2a
Pipeline #51865 failed with stages
in 40 minutes and 3 seconds
......@@ -69,9 +69,9 @@ appicons_DATA= \
gda-control-center.png
@INTLTOOL_XML_RULE@
appdatadir = $(datadir)/appdata
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = gda-control-center-6.0.appdata.xml.in
metainfodir = $(datadir)/metainfo
metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
metainfo_in_files = gda-control-center-6.0.appdata.xml.in
@INTLTOOL_DESKTOP_RULE@
desktopdir=$(datadir)/applications
......@@ -82,12 +82,12 @@ EXTRA_DIST = \
$(RESOURCES) \
control-center-res.rc \
gda-control-center.ico \
$(appdata_in_files) \
$(metainfo_in_files) \
$(Desktop_in_files)
DISTCLEANFILES = \
$(desktop_DATA) \
$(appdata_DATA)
$(metainfo_DATA)
CLEANFILES = \
control-center.gresources.c
......@@ -88,9 +88,9 @@ appicons_DATA= \
data/256x256/gda-browser-6.0.png
@INTLTOOL_XML_RULE@
appdatadir = $(datadir)/appdata
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = gda-browser-6.0.appdata.xml.in
metainfodir = $(datadir)/metainfo
metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
metainfo_in_files = gda-browser-6.0.appdata.xml.in
@INTLTOOL_DESKTOP_RULE@
desktopdir=$(datadir)/applications
......@@ -100,11 +100,11 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
browser-marshal.list \
$(Desktop_in_files) \
$(appdata_in_files) \
$(metainfo_in_files) \
$(appicons_DATA)
DISTCLEANFILES = \
$(desktop_DATA) \
gda-browser-6.0.desktop.in \
$(appdata_DATA)
$(metainfo_DATA)
......@@ -105,7 +105,7 @@ custom_target('gda-browser-6.0.appdata',
input: 'gda-browser-6.0.appdata.xml.in',
output: 'gda-browser-6.0.appdata.xml',
install: true,
install_dir: join_paths(get_option('datadir'),'appdata')
install_dir: join_paths(get_option('datadir'),'metainfo')
)
browser_deps += inc_browserdirh_dep
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment