build: Use PACKAGE_URL variable

7 files changed, 39 insertions, 26 deletions

diff --git a/configure.ac b/configure.ac
index d36d8a87..0fe2eaed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,13 @@ m4_define([ev_binary_version], [ev_document_lt_current])
 # *****************************************************************************
 
 AC_PREREQ([2.57])
-AC_INIT([atril], [ev_version], [https://mate-desktop.org/], [atril])
+
+AC_INIT([atril],
+        [ev_version],
+        [https://github.com/mate-desktop/atril/issues],
+        [atril],
+        [https://mate-desktop.org])
+
 AM_INIT_AUTOMAKE([1.10 foreign tar-ustar dist-xz no-dist-gzip check-news])
 
 AC_CONFIG_HEADERS([config.h])
@@ -717,6 +723,7 @@ cut-n-paste/smclient/Makefile
 cut-n-paste/smclient/libegg/Makefile
 cut-n-paste/toolbar-editor/Makefile
 cut-n-paste/zoom-control/Makefile
+data/atril.appdata.xml.in
 data/atril.desktop.in
 data/Makefile
 data/icons/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index d357c793..f6a99571 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,24 +14,23 @@ man_MANS=atril.1
 #
 
 uidir = $(pkgdatadir)
-ui_DATA =				\
+ui_DATA = \
 	hand-open.png
 
 #
 # Desktop file
 #
 
-DESKTOP_IN_FILES = atril.desktop.in
-DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
-
 desktopdir = $(datadir)/applications
-desktop_DATA = $(DESKTOP_FILES)
-$(desktop_DATA): $(DESKTOP_IN_FILES)
+desktop_in_files = atril.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+$(desktop_DATA): $(desktop_in_files)
 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 #
 # DBus servide file
 #
+
 if ENABLE_DBUS
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.mate.atril.Daemon.service.in
@@ -44,8 +43,10 @@ endif
 #
 # App data file
 #
+
 appdatadir = $(datadir)/metainfo
-appdata_in_files = atril.appdata.xml.in
+appdata_in_in_files = atril.appdata.xml.in.in
+appdata_in_files = $(appdata_in_in_files:.appdata.xml.in.in=.appdata.xml.in)
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 $(appdata_DATA): $(appdata_in_files)
 	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
@@ -53,6 +54,7 @@ $(appdata_DATA): $(appdata_in_files)
 #
 # GSettings schema
 #
+
 gsettings_SCHEMAS = org.mate.Atril.gschema.xml
 
 .PRECIOUS: $(gsettings_SCHEMAS)
@@ -60,7 +62,6 @@ gsettings_SCHEMAS = org.mate.Atril.gschema.xml
 # include the appropriate makefile rules for schema handling
 @GSETTINGS_RULES@
 
-
 #
 # GTK icon cache
 #
@@ -79,18 +80,18 @@ update-icon-cache:
 	        echo "***   $(gtk_update_icon_cache)"; \
 	        fi
 
-
 #
 # Extra files to be included in the tarball
 #
 
 EXTRA_DIST =					\
-	$(ui_DATA)				\
-	$(DESKTOP_IN_FILES)			\
-	$(appdata_in_files)			\
+	$(appdata_in_in_files)			\
+	$(desktop_in_files)			\
 	$(gsettings_SCHEMAS)			\
-	org.mate.atril.Daemon.service.in	\
 	$(man_MANS)				\
+	$(service_in_files)			\
+	$(ui_DATA)				\
+	org.mate.atril.Daemon.service.in	\
 	$(NULL)
 
 #
@@ -98,10 +99,13 @@ EXTRA_DIST =					\
 #
 
 CLEANFILES = \
-	atril.appdata.xml
+	$(appdata_DATA)		\
+	$(desktop_DATA)		\
+	$(service_DATA)		\
+	$(NULL)
 
 DISTCLEANFILES = \
-	$(DESKTOP_FILES)	\
-	$(service_DATA)
+	$(appdata_in_files)	\
+	$(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/atril.appdata.xml.in b/data/atril.appdata.xml.in.in
index c54aee98..963e6d84 100644
--- a/data/atril.appdata.xml.in
+++ b/data/atril.appdata.xml.in.in
@@ -38,7 +38,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/po/POTFILES.in b/po/POTFILES.in
index 22e3e78a..f4395b52 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,14 +24,14 @@ cut-n-paste/smclient/libegg/eggsmclient.c
 cut-n-paste/toolbar-editor/egg-editable-toolbar.c
 cut-n-paste/toolbar-editor/egg-toolbar-editor.c
 cut-n-paste/zoom-control/ephy-zoom.h
-data/atril.appdata.xml.in
+data/atril.appdata.xml.in.in
 data/atril.desktop.in.in
 data/org.mate.Atril.gschema.xml
 previewer/ev-previewer.c
 previewer/ev-previewer-window.c
 properties/ev-properties-main.c
 properties/ev-properties-view.c
-properties/libatril-properties-page.caja-extension.desktop.in
+properties/libatril-properties-page.caja-extension.desktop.in.in
 libmisc/ev-page-action.c
 libmisc/ev-page-action-widget.c
 libview/ev-print-operation.c
diff --git a/properties/Makefile.am b/properties/Makefile.am
index a3cb40fb..74005f0a 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS=					\
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
 	$(FRONTEND_CFLAGS)			\
-	$(CAJA_CFLAGS)			\
+	$(CAJA_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
 	$(WARN_CFLAGS)
 
@@ -19,7 +19,7 @@ if ENABLE_CAJA
 cajaextension_LTLIBRARIES = libatril-properties-page.la
 
 libatril_properties_page_la_CFLAGS = -I$(top_srcdir)
-libatril_properties_page_la_SOURCES = 	\
+libatril_properties_page_la_SOURCES =		\
 	ev-properties-main.c
 
 libatril_properties_page_la_LIBADD = 		\
@@ -31,13 +31,15 @@ libatril_properties_page_la_LIBADD = 		\
 libatril_properties_page_la_LDFLAGS = -module -avoid-version -no-undefined
 
 extensiondir = $(datadir)/caja/extensions
-extension_in_files = libatril-properties-page.caja-extension.desktop.in
+extension_in_in_files = libatril-properties-page.caja-extension.desktop.in.in
+extension_in_files = $(extension_in_in_files:.caja-extension.desktop.in.in=.caja-extension.desktop.in)
 extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
 $(extension_DATA): $(extension_in_files)
 	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
-EXTRA_DIST = $(extension_in_files)
+EXTRA_DIST = $(extension_in_in_files)
 
+DISTCLEANFILES = $(extension_in_files)
 CLEANFILES = $(extension_DATA)
 
 endif # ENABLE_CAJA
diff --git a/properties/libatril-properties-page.caja-extension.desktop.in.in b/properties/libatril-properties-page.caja-extension.desktop.in.in
index dadb6600..8bc9dc9e 100644
--- a/properties/libatril-properties-page.caja-extension.desktop.in.in
+++ b/properties/libatril-properties-page.caja-extension.desktop.in.in
@@ -5,5 +5,5 @@ Name=Atril properties
 Description=Shows details for Atril documents
 Version=@VERSION@
 Author=Andrew Sobala <[email protected]>;Bastien Nocera <[email protected]>
-Website=https://mate-desktop.org/
+Website=@PACKAGE_URL@
 Copyright=Copyright (C) 2000, 2001 Eazel Inc.\nCopyright (C) 2003 Andrew Sobala <[email protected]>\nCopyright (C) 2005 Bastien Nocera <[email protected]>\nCopyright (C) 2005 Red Hat, Inc\nCopyright (C) 2012–2018 The MATE developers
diff --git a/shell/ev-window.c b/shell/ev-window.c
index b26795e1..d8ce61de 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -5446,7 +5446,7 @@ ev_window_cmd_help_about (GtkAction *action, EvWindow *ev_window)
 		"copyright", _("Copyright \xc2\xa9 1996–2009 The Evince authors\n"
 		               "Copyright \xc2\xa9 2012–2021 The MATE developers"),
 		"license", license_trans,
-		"website", "https://mate-desktop.org/",
+		"website", PACKAGE_URL,
 		"comments", comments,
 		"authors", authors,
 		"documenters", documenters,