diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-10-16 11:20:17 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-10-16 11:30:25 +0200 |
| commit | b1a7c2b93723cdfdf64e17fb16e7484c6a448d7d (patch) | |
| tree | 3143ce9b41176f5f241724948241e42818560c98 | |
| parent | 96aaee081a703ab3d07e6123caf74c4a292ba5d2 (diff) | |
| download | network-manager-applet-b1a7c2b93723cdfdf64e17fb16e7484c6a448d7d.tar.gz | |
meson: fix the package name
In meson lingo, "project_name" is what PACKAGE_TARNAME is for autotools,
not PACKAGE_NAME. For us, it's "network-manager-applet", not
"nm-applet".
| -rw-r--r-- | meson.build | 14 | ||||
| -rw-r--r-- | po/meson.build | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/meson.build b/meson.build index aa7d3f35..2352850b 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project( - 'nm-applet', 'c', + 'network-manager-applet', 'c', version: '1.8.5', license: 'GPL2+', default_options: [ @@ -55,14 +55,14 @@ set_defines = [ # package ['PACKAGE', nma_long_name], ['PACKAGE_BUGREPORT', 'http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'], - ['PACKAGE_NAME', meson.project_name()], - ['PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), nma_version)], + ['PACKAGE_NAME', 'nm-applet'], + ['PACKAGE_STRING', 'nm-applet @1@'.format(nma_version)], ['PACKAGE_TARNAME', nma_long_name], ['PACKAGE_URL', ''], ['PACKAGE_VERSION', nma_version], ['VERSION', nma_version], # i18n - ['GETTEXT_PACKAGE', meson.project_name()] + ['GETTEXT_PACKAGE', 'nm-applet'] ] foreach define: set_defines @@ -468,9 +468,9 @@ custom_target( ) schema_conf = configuration_data() -schema_conf.set('GETTEXT_PACKAGE', meson.project_name()) +schema_conf.set('GETTEXT_PACKAGE', 'nm-applet') -schema = 'org.gnome.@0@.gschema.xml'.format(meson.project_name()) +schema = 'org.gnome.nm-applet.gschema.xml' configure_file( input: schema + '.in', @@ -481,7 +481,7 @@ configure_file( ) install_data( - meson.project_name() + '.convert', + 'nm-applet.convert', install_dir: join_paths(nma_datadir, 'GConf', 'gsettings') ) diff --git a/po/meson.build b/po/meson.build index e9b77d79..64eaaff1 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1 +1 @@ -i18n.gettext(meson.project_name(), preset: 'glib') +i18n.gettext('nm-applet', preset: 'glib') |