summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/meson.build4
-rw-r--r--doc/reference/meson.build2
-rw-r--r--plugins/fullscreen/meson.build4
-rw-r--r--plugins/reload/meson.build4
-rw-r--r--plugins/statusbar-date/meson.build4
-rw-r--r--src/meson.build2
6 files changed, 11 insertions, 9 deletions
diff --git a/data/meson.build b/data/meson.build
index 4dbd1e6..06acf52 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,7 +13,7 @@ if get_option('nls')
po_dir: po_dir,
)
else
- install_data(desktopfile, install_dir: desktopdir)
+ install_data(desktopfile, install_dir: desktopdir, rename: ['eom.desktop'])
endif
gnome.post_install(update_desktop_database: true)
@@ -30,7 +30,7 @@ if get_option('nls')
po_dir: po_dir,
)
else
- install_data(appdatafile, install_dir: appdatadir)
+ install_data(appdatafile, install_dir: appdatadir, rename: ['eom.appdata.xml'])
endif
gsettings_schema = configure_file(input: 'org.mate.eom.gschema.xml.in', configuration: pkg_info, output: 'org.mate.eom.gschema.xml')
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index 6805b3c..fab9d02 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -16,6 +16,7 @@ endif
sgml = configure_file(input: 'eom-docs.sgml.in', configuration: pkg_info, output: 'eom-docs.sgml')
versionsxml = configure_file(input: 'version.xml.in', configuration: pkg_info, output: 'version.xml')
+if false
gnome.gtkdoc(
'eom',
src_dir: src_inc,
@@ -28,3 +29,4 @@ gnome.gtkdoc(
dependencies: [all_deps, libeom],
install: true,
)
+endif
diff --git a/plugins/fullscreen/meson.build b/plugins/fullscreen/meson.build
index 9688a12..960a09e 100644
--- a/plugins/fullscreen/meson.build
+++ b/plugins/fullscreen/meson.build
@@ -2,14 +2,14 @@ desktopfile = configure_file(input: 'fullscreen.plugin.desktop.in.in', configura
if get_option('nls')
i18n.merge_file(
input: desktopfile,
- output: 'fullscreen.plugin.desktop',
+ output: 'fullscreen.plugin',
install: true,
install_dir: pluginsdir,
type: 'desktop',
po_dir: po_dir,
)
else
- install_data(desktopfile, install_dir: pluginsdir)
+ install_data(desktopfile, install_dir: pluginsdir, rename: ['fullscreen.plugin'])
endif
shared_library(
diff --git a/plugins/reload/meson.build b/plugins/reload/meson.build
index de76d56..5078556 100644
--- a/plugins/reload/meson.build
+++ b/plugins/reload/meson.build
@@ -2,14 +2,14 @@ desktopfile = configure_file(input: 'reload.plugin.desktop.in.in', configuration
if get_option('nls')
i18n.merge_file(
input: desktopfile,
- output: 'reload.plugin.desktop',
+ output: 'reload.plugin',
install: true,
install_dir: pluginsdir,
type: 'desktop',
po_dir: po_dir,
)
else
- install_data(desktopfile, install_dir: pluginsdir)
+ install_data(desktopfile, install_dir: pluginsdir, rename: ['reload.plugin'])
endif
shared_library(
diff --git a/plugins/statusbar-date/meson.build b/plugins/statusbar-date/meson.build
index 7ddf83c..bdde68f 100644
--- a/plugins/statusbar-date/meson.build
+++ b/plugins/statusbar-date/meson.build
@@ -2,14 +2,14 @@ desktopfile = configure_file(input: 'statusbar-date.plugin.desktop.in.in', confi
if get_option('nls')
i18n.merge_file(
input: desktopfile,
- output: 'statusbar-date.plugin.desktop',
+ output: 'statusbar-date.plugin',
install: true,
install_dir: pluginsdir,
type: 'desktop',
po_dir: po_dir,
)
else
- install_data(desktopfile, install_dir: pluginsdir)
+ install_data(desktopfile, install_dir: pluginsdir, rename: ['statusbar-date.plugin'])
endif
shared_library(
diff --git a/src/meson.build b/src/meson.build
index d89162a..92e6fff 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,5 +1,5 @@
resources = gnome.compile_resources(
- 'eom',
+ 'eom-resources',
'eom.gresource.xml',
c_name: '_eom',
source_dir: '../data',