diff options
| author | rbuj <[email protected]> | 2021-01-26 12:45:31 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2021-02-05 13:59:47 +0100 |
| commit | e27dbb3b7971c77c178e0e6d523aa9f09b98b41e (patch) | |
| tree | 0072c5621cefa67ee64c6dfbd3bc8d62ecf6a99c | |
| parent | 0f0aa4b521d034d4f8258c3857c732037f98165a (diff) | |
| download | mate-terminal-e27dbb3b7971c77c178e0e6d523aa9f09b98b41e.tar.bz2 mate-terminal-e27dbb3b7971c77c178e0e6d523aa9f09b98b41e.tar.xz | |
build: Use PACKAGE_URL variable
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | mate-terminal.appdata.xml.in.in (renamed from mate-terminal.appdata.xml.in) | 2 | ||||
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | src/terminal-window.c | 2 |
6 files changed, 20 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index e10f2e5..95f078e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,8 +11,9 @@ DISTCHECK_CONFIGURE_FLAGS = \ CFLAGS='-Wno-deprecated-declarations' appdatadir = $(datadir)/metainfo -appdata_in_files = mate-terminal.appdata.xml.in -appdata_DATA = $(appdata_in_files:.xml.in=.xml) +appdata_DATA = mate-terminal.appdata.xml +appdata_in_files = $(appdata_DATA:.xml=.xml.in) +appdata_in_in_files = $(appdata_in_files:.xml.in=.xml.in.in) $(appdata_DATA): $(appdata_in_files) $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ @@ -31,15 +32,20 @@ EXTRA_DIST = \ xmldocs.make \ omf.make \ mate-terminal.wrapper \ - $(appdata_in_files) \ + $(appdata_in_in_files) \ $(man_MANS) \ $(NULL) CLEANFILES = \ mate-terminal.appdata.xml \ + $(appdata_DATA) \ $(desktop_DATA) \ $(NULL) +DISTCLEANFILES = \ + $(appdata_in_files) \ + $(NULL) + MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ $(srcdir)/aclocal.m4 \ diff --git a/configure.ac b/configure.ac index c15986c..c053d14 100644 --- a/configure.ac +++ b/configure.ac @@ -146,6 +146,7 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) AC_CONFIG_FILES([ Makefile +mate-terminal.appdata.xml.in mate-terminal.desktop.in src/Makefile src/mate-submodules/Makefile diff --git a/mate-terminal.appdata.xml.in b/mate-terminal.appdata.xml.in.in index dee6309..e987ed9 100644 --- a/mate-terminal.appdata.xml.in +++ b/mate-terminal.appdata.xml.in.in @@ -37,7 +37,7 @@ </image> </screenshot> </screenshots> - <url type="homepage">https://mate-desktop.org</url> + <url type="homepage">@PACKAGE_URL@</url> <updatecontact>[email protected]</updatecontact> <project_group>MATE</project_group> </component> diff --git a/meson.build b/meson.build index d734ab7..102107a 100644 --- a/meson.build +++ b/meson.build @@ -202,9 +202,15 @@ endif install_man('mate-terminal.1') +appdata_file_configured = configure_file( + input: 'mate-terminal.appdata.xml.in.in', + output: 'mate-terminal.appdata.xml.in', + configuration: config_h, +) + appdata_file = i18n.merge_file( 'appdata-file', - input: 'mate-terminal.appdata.xml.in', + input: appdata_file_configured, output: 'mate-terminal.appdata.xml', type: 'xml', po_dir: join_paths(srcdir, 'po'), diff --git a/po/POTFILES.in b/po/POTFILES.in index c053d31..f64836d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -mate-terminal.appdata.xml.in +mate-terminal.appdata.xml.in.in mate-terminal.desktop.in.in src/confirm-close-dialog.ui src/mate-submodules/libegg/eggsmclient.c diff --git a/src/terminal-window.c b/src/terminal-window.c index 9ca8cd6..dc7a495 100644 --- a/src/terminal-window.c +++ b/src/terminal-window.c @@ -4448,7 +4448,7 @@ help_about_callback (GtkAction *action, "wrap-license", TRUE, "translator-credits", _("translator-credits"), "logo-icon-name", MATE_TERMINAL_ICON_NAME, - "website", "https://mate-desktop.org", + "website", PACKAGE_URL, NULL); g_free (comments); |