From 97e1fe87f7cb362e0731b4aceec5b8f21e5632d1 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Tue, 26 Jan 2021 13:08:32 +0100
Subject: build: Use PACKAGE_URL variable

---
 plugins/taglist/Makefile.am                  | 28 +++++++++++++---------------
 plugins/taglist/taglist.plugin.desktop.in    |  8 --------
 plugins/taglist/taglist.plugin.desktop.in.in |  8 ++++++++
 3 files changed, 21 insertions(+), 23 deletions(-)
 delete mode 100644 plugins/taglist/taglist.plugin.desktop.in
 create mode 100644 plugins/taglist/taglist.plugin.desktop.in.in

(limited to 'plugins/taglist')

diff --git a/plugins/taglist/Makefile.am b/plugins/taglist/Makefile.am
index d2573f3d..43f87300 100644
--- a/plugins/taglist/Makefile.am
+++ b/plugins/taglist/Makefile.am
@@ -4,16 +4,16 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 taglistdir = $(PLUMA_PLUGINS_DATA_DIR)/taglist
 
 taglist_in_files = \
-	HTML.tags.xml.in	\
-	Latex.tags.xml.in	\
-	XSLT.tags.xml.in \
+	HTML.tags.xml.in		\
+	Latex.tags.xml.in		\
+	XSLT.tags.xml.in		\
 	XUL.tags.xml.in
 
 taglist_DATA = $(taglist_in_files:.tags.xml.in=.tags.gz)
 
-AM_CPPFLAGS = 							\
-	-I$(top_srcdir) 					\
-	$(PLUMA_CFLAGS) 					\
+AM_CPPFLAGS = \
+	-I$(top_srcdir) 		\
+	$(PLUMA_CFLAGS)			\
 	$(WARN_CFLAGS)
 
 plugin_LTLIBRARIES = libtaglist.la
@@ -29,8 +29,9 @@ libtaglist_la_SOURCES = \
 libtaglist_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libtaglist_la_LIBADD  = $(PLUMA_LIBS)
 
-plugin_in_files = taglist.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = taglist.plugin
+plugin_in_files = $(plugin_DATA:.plugin=.plugin.desktop.in)
+plugin_in_in_files = $(plugin_in_files:.plugin.desktop.in=.plugin.desktop.in.in)
 
 $(plugin_DATA): $(plugin_in_files)
 	$(AM_V_GEN) $(MSGFMT) --keyword=Name --keyword=Description --desktop --template $< -d $(top_srcdir)/po -o $@
@@ -42,17 +43,14 @@ GZIP_ENV = -9
 	GZIP=$(GZIP_ENV) gzip -n -f $(@:.gz=)
 
 EXTRA_DIST = \
-	$(taglist_in_files) $(taglist_DATA)	\
-	$(plugin_in_files) $(plugin_DATA)
+	$(taglist_in_files) \
+	$(plugin_in_in_files)
 
 CLEANFILES = \
 	$(taglist_DATA)	\
 	$(plugin_DATA)
-DISTCLEANFILES = \
-	$(taglist_DATA)	\
-	$(plugin_DATA)
-
-
 
+DISTCLEANFILES = \
+	$(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/taglist/taglist.plugin.desktop.in b/plugins/taglist/taglist.plugin.desktop.in
deleted file mode 100644
index 550dba2e..00000000
--- a/plugins/taglist/taglist.plugin.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Plugin]
-Module=taglist
-IAge=2
-Name=Tag list
-Description=Provides a method to easily insert commonly used tags/strings into a document without having to type them.
-Authors=Paolo Maggi <paolo.maggi@polito.it>
-Copyright=Copyright © 2002-2005 Paolo Maggi
-Website=https://mate-desktop.org
diff --git a/plugins/taglist/taglist.plugin.desktop.in.in b/plugins/taglist/taglist.plugin.desktop.in.in
new file mode 100644
index 00000000..ee9ddbd5
--- /dev/null
+++ b/plugins/taglist/taglist.plugin.desktop.in.in
@@ -0,0 +1,8 @@
+[Plugin]
+Module=taglist
+IAge=2
+Name=Tag list
+Description=Provides a method to easily insert commonly used tags/strings into a document without having to type them.
+Authors=Paolo Maggi <paolo.maggi@polito.it>
+Copyright=Copyright © 2002-2005 Paolo Maggi
+Website=@PACKAGE_URL@
-- 
cgit v1.2.1