From afd8f48f9b71f68953bc8e6bf4859031475aee0f Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Tue, 26 Jan 2021 10:56:28 +0100
Subject: build: Use PACKAGE_URL variable

---
 data/Makefile.am           | 28 +++++++++++++++-------------
 data/eom.appdata.xml.in    | 19 -------------------
 data/eom.appdata.xml.in.in | 19 +++++++++++++++++++
 3 files changed, 34 insertions(+), 32 deletions(-)
 delete mode 100644 data/eom.appdata.xml.in
 create mode 100644 data/eom.appdata.xml.in.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 4842527..b7b61a2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,16 +1,16 @@
 SUBDIRS = pixmaps icons
 
-DESKTOP_IN_FILES= eom.desktop.in.in
-DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
-
 desktopdir = $(datadir)/applications
-desktop_DATA = $(DESKTOP_FILES)
-$(desktop_DATA): $(DESKTOP_IN_FILES)
+desktop_DATA = eom.desktop
+desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
+desktop_in_in_files = $(desktop_in_files:.desktop.in=.desktop.in.in)
+$(desktop_DATA): $(desktop_in_files)
 	$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 
 appdatadir = $(datadir)/metainfo
-appdata_in_files = eom.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_DATA = eom.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 $@
 
@@ -29,7 +29,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = eom.pc
 
 EXTRA_DIST = \
-	$(ui_DATA) \
+	$(ui_DATA)		\
 	eom.css			\
 	eom-image-properties-dialog.ui	\
 	eom-multiple-save-as-dialog.ui	\
@@ -37,14 +37,16 @@ EXTRA_DIST = \
 	eom-ui.xml		\
 	metadata-sidebar.ui	\
 	eom.about		\
-	$(DESKTOP_IN_FILES) \
-	$(appdata_in_files)
+	$(appdata_in_in_files)	\
+	$(desktop_in_in_files)
 
 CLEANFILES = \
-        $(appdata_DATA)
+	$(appdata_DATA) \
+	$(desktop_DATA)
 
 DISTCLEANFILES = \
-        $(DESKTOP_FILES) \
-        $(gsettings_SCHEMAS)
+	$(appdata_in_files) \
+	$(desktop_in_files) \
+	$(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/eom.appdata.xml.in b/data/eom.appdata.xml.in
deleted file mode 100644
index b1a2635..0000000
--- a/data/eom.appdata.xml.in
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Ryan Lerch <rlerch@redhat.com> -->
-<component type="desktop">
-  <id>eom.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>Eye of MATE</name>
-  <summary>Simple image viewer</summary>
-  <description>
-    <p>
-      Eye of MATE is a simple viewer for browsing images on your computer.
-      Once an image is loaded, you can zoom and rotate the image, and also view
-      subsequent images in the directory the image was loaded from.
-    </p>
-  </description>
-  <url type="homepage">http://mate-desktop.org/</url>
-  <screenshots>
-    <screenshot type="default">http://mate-desktop.org/gallery/1.8/eom.png</screenshot>
-  </screenshots>
-</component>
diff --git a/data/eom.appdata.xml.in.in b/data/eom.appdata.xml.in.in
new file mode 100644
index 0000000..3aa83a4
--- /dev/null
+++ b/data/eom.appdata.xml.in.in
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Ryan Lerch <rlerch@redhat.com> -->
+<component type="desktop">
+  <id>eom.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>Eye of MATE</name>
+  <summary>Simple image viewer</summary>
+  <description>
+    <p>
+      Eye of MATE is a simple viewer for browsing images on your computer.
+      Once an image is loaded, you can zoom and rotate the image, and also view
+      subsequent images in the directory the image was loaded from.
+    </p>
+  </description>
+  <url type="homepage">@PACKAGE_URL@</url>
+  <screenshots>
+    <screenshot type="default">https://mate-desktop.org/gallery/1.8/eom.png</screenshot>
+  </screenshots>
+</component>
-- 
cgit v1.2.1