24 files changed, 89 insertions, 82 deletions
diff --git a/plugins/docinfo/Makefile.am b/plugins/docinfo/Makefile.am
index 076bae60..1447c54a 100644
--- a/plugins/docinfo/Makefile.am
+++ b/plugins/docinfo/Makefile.am
@@ -20,15 +20,16 @@ ui_files = docinfo.ui
 include $(top_srcdir)/gla11y.mk
 ui_DATA = $(ui_files)
 
-plugin_in_files = docinfo.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = docinfo.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 $@
 
-EXTRA_DIST = $(ui_DATA) $(plugin_in_files) ui-a11y.suppr
+EXTRA_DIST = $(ui_DATA) $(plugin_in_in_files) ui-a11y.suppr
 
 CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/docinfo/docinfo.plugin.desktop.in b/plugins/docinfo/docinfo.plugin.desktop.in.in
index 3f6b32e3..4848aa37 100644
--- a/plugins/docinfo/docinfo.plugin.desktop.in
+++ b/plugins/docinfo/docinfo.plugin.desktop.in.in
@@ -5,3 +5,4 @@ Name=Document Statistics
 Description=Analyzes the current document and reports the number of words, lines, characters and non-space characters in it.
 Authors=Paolo Maggi <[email protected]>;Jorge Alberto Torres <[email protected]>
 Copyright=Copyright © 2002-2005 Paolo Maggi
+Website=@PACKAGE_URL@
diff --git a/plugins/externaltools/Makefile.am b/plugins/externaltools/Makefile.am
index 9cff7fa7..1a160be0 100644
--- a/plugins/externaltools/Makefile.am
+++ b/plugins/externaltools/Makefile.am
@@ -2,15 +2,16 @@
 SUBDIRS = tools data scripts
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-plugin_in_files = externaltools.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = externaltools.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 $@
 
-EXTRA_DIST = $(plugin_in_files)
+EXTRA_DIST = $(plugin_in_in_files)
 
 CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/externaltools/externaltools.plugin.desktop.in b/plugins/externaltools/externaltools.plugin.desktop.in.in
index 8fe1bd53..edd7187e 100644
--- a/plugins/externaltools/externaltools.plugin.desktop.in
+++ b/plugins/externaltools/externaltools.plugin.desktop.in.in
@@ -6,4 +6,4 @@ Name=External Tools
 Description=Execute external commands and shell scripts.
 Authors=Steve Frécinaux <[email protected]>
 Copyright=Copyright © 2005 Steve Frécinaux
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index ecc55088..5f6c99ab 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -3,8 +3,8 @@
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir) 						\
-	$(PLUMA_CFLAGS) 						\
+	-I$(top_srcdir)				\
+	$(PLUMA_CFLAGS) 			\
 	$(WARN_CFLAGS)
 
 BUILT_SOURCES = \
@@ -41,8 +41,9 @@ libfilebrowser_la_LIBADD = $(PLUMA_LIBS)
 uidir = $(PLUMA_PLUGINS_DATA_DIR)/filebrowser
 ui_DATA = pluma-file-browser-widget-ui.xml
 
-plugin_in_files = filebrowser.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = filebrowser.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 $@
@@ -61,20 +62,20 @@ gsettings_SCHEMAS = $(filebrowser_gschema_in:.xml.in=.xml)
 
 EXTRA_DIST = \
 	$(ui_DATA)					\
-	$(plugin_in_files)				\
+	$(plugin_in_in_files)				\
 	$(filebrowser_gschema_in)			\
 	pluma-file-browser-enum-types.h.template	\
 	pluma-file-browser-enum-types.c.template	\
 	pluma-file-browser-enum-register.c.template
 
 CLEANFILES = \
-	$(plugin_DATA)		\
+	$(plugin_DATA)			\
 	$(gsettings_SCHEMAS_in)		\
 	$(gsettings_SCHEMAS)		\
 	$(BUILT_SOURCES)
 
 DISTCLEANFILES = \
-	$(plugin_DATA)		\
+	$(plugin_in_files)		\
 	$(gsettings_SCHEMAS_in)		\
 	$(gsettings_SCHEMAS)		\
 	$(BUILT_SOURCES)
diff --git a/plugins/filebrowser/filebrowser.plugin.desktop.in b/plugins/filebrowser/filebrowser.plugin.desktop.in.in
index 13760d41..a40173c7 100644
--- a/plugins/filebrowser/filebrowser.plugin.desktop.in
+++ b/plugins/filebrowser/filebrowser.plugin.desktop.in.in
@@ -8,4 +8,4 @@ Description=Easy file access from the side pane
 Icon=system-file-manager
 Authors=Jesse van den Kieboom <[email protected]>
 Copyright=Copyright © 2006 Jesse van den Kieboom
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
diff --git a/plugins/modelines/Makefile.am b/plugins/modelines/Makefile.am
index abcb58db..ceb2faa3 100644
--- a/plugins/modelines/Makefile.am
+++ b/plugins/modelines/Makefile.am
@@ -21,17 +21,18 @@ libmodelines_la_SOURCES = \
 libmodelines_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libmodelines_la_LIBADD  = $(PLUMA_LIBS)
 
-plugin_in_files = modelines.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = modelines.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 $@
 
 EXTRA_DIST = \
-	$(plugin_in_files)				\
+	$(plugin_in_in_files)				\
 	$(modelines_DATA)
 
 CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/modelines/modelines.plugin.desktop.in b/plugins/modelines/modelines.plugin.desktop.in.in
index 2d30c34e..deb39fa7 100644
--- a/plugins/modelines/modelines.plugin.desktop.in
+++ b/plugins/modelines/modelines.plugin.desktop.in.in
@@ -5,4 +5,4 @@ Name=Modelines
 Description=Emacs, Kate and Vim-style modelines support for pluma.
 Authors=Steve Frécinaux <[email protected]>
 Copyright=Copyright © 2005 Steve Frécinaux
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
diff --git a/plugins/pythonconsole/Makefile.am b/plugins/pythonconsole/Makefile.am
index 7c6a02e4..006589ea 100644
--- a/plugins/pythonconsole/Makefile.am
+++ b/plugins/pythonconsole/Makefile.am
@@ -2,8 +2,9 @@
 SUBDIRS = pythonconsole
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-plugin_in_files = pythonconsole.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = pythonconsole.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 $@
@@ -13,16 +14,16 @@ gsettings_SCHEMAS = $(pythonconsole_gschema_in:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-	$(plugin_in_files) \
+	$(plugin_in_in_files)		\
 	$(pythonconsole_gschema_in)
 
 CLEANFILES = \
-	$(plugin_DATA) \
+	$(plugin_DATA)			\
 	$(gsettings_SCHEMAS_in)		\
 	$(gsettings_SCHEMAS)
 
 DISTCLEANFILES = \
-	$(plugin_DATA) \
+	$(plugin_in_files)		\
 	$(gsettings_SCHEMAS_in)		\
 	$(gsettings_SCHEMAS)
 
diff --git a/plugins/pythonconsole/pythonconsole.plugin.desktop.in b/plugins/pythonconsole/pythonconsole.plugin.desktop.in.in
index 624b0cfd..41a5a79e 100644
--- a/plugins/pythonconsole/pythonconsole.plugin.desktop.in
+++ b/plugins/pythonconsole/pythonconsole.plugin.desktop.in.in
@@ -8,4 +8,4 @@ Description=Interactive Python console standing in the bottom panel
 Icon=text-x-python
 Authors=Steve Frécinaux <[email protected]>
 Copyright=Copyright © 2006 Steve Frécinaux
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
diff --git a/plugins/quickopen/Makefile.am b/plugins/quickopen/Makefile.am
index e03a7147..77371f10 100644
--- a/plugins/quickopen/Makefile.am
+++ b/plugins/quickopen/Makefile.am
@@ -2,15 +2,16 @@
 SUBDIRS = quickopen
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-plugin_in_files = quickopen.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = quickopen.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 $@
 
-EXTRA_DIST = $(plugin_in_files)
+EXTRA_DIST = $(plugin_in_in_files)
 
 CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/quickopen/quickopen.plugin.desktop.in b/plugins/quickopen/quickopen.plugin.desktop.in.in
index 2b3261de..501e62a2 100644
--- a/plugins/quickopen/quickopen.plugin.desktop.in
+++ b/plugins/quickopen/quickopen.plugin.desktop.in.in
@@ -8,4 +8,4 @@ Description=Quickly open files
 Icon=document-open
 Authors=Jesse van den Kieboom  <[email protected]>
 Copyright=Copyright © 2009 Jesse van den Kieboom
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
diff --git a/plugins/snippets/Makefile.am b/plugins/snippets/Makefile.am
index 24f5a5b4..4fb11030 100644
--- a/plugins/snippets/Makefile.am
+++ b/plugins/snippets/Makefile.am
@@ -2,15 +2,16 @@
 SUBDIRS = snippets data
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
-plugin_in_files = snippets.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = snippets.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 $@
 
-EXTRA_DIST = $(plugin_in_files)
+EXTRA_DIST = $(plugin_in_in_files)
 
 CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/snippets/snippets.plugin.desktop.in b/plugins/snippets/snippets.plugin.desktop.in.in
index 84de9c76..5f858b17 100644
--- a/plugins/snippets/snippets.plugin.desktop.in
+++ b/plugins/snippets/snippets.plugin.desktop.in.in
@@ -6,4 +6,4 @@ Name=Snippets
 Description=Insert often-used pieces of text in a fast way
 Authors=Jesse van den Kieboom <[email protected]>
 Copyright=Copyright © 2005 Jesse van den Kieboom
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
diff --git a/plugins/sort/Makefile.am b/plugins/sort/Makefile.am
index 2f211352..c5b652ad 100644
--- a/plugins/sort/Makefile.am
+++ b/plugins/sort/Makefile.am
@@ -20,16 +20,16 @@ ui_files = sort.ui
 include $(top_srcdir)/gla11y.mk
 ui_DATA = $(ui_files)
 
-plugin_in_files = sort.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = sort.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 $@
 
-EXTRA_DIST = $(ui_DATA) $(plugin_in_files) ui-a11y.suppr
+EXTRA_DIST = $(ui_DATA) $(plugin_in_in_files) ui-a11y.suppr
 
 CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
-
+DISTCLEANFILES = $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/sort/sort.plugin.desktop.in b/plugins/sort/sort.plugin.desktop.in.in
index b076a43c..7704c75d 100644
--- a/plugins/sort/sort.plugin.desktop.in
+++ b/plugins/sort/sort.plugin.desktop.in.in
@@ -7,4 +7,4 @@ Description=Sorts a document or selected text.
 Icon=view-sort-ascending
 Authors=Carlo Borreo <[email protected]>;Lee Mallabone <[email protected]>;Paolo Maggi <[email protected]>;Jorge Alberto Torres H. <[email protected]>
 Copyright=Copyright © 2001 Carlo Borreo\nCopyright © 2002-2003 Lee Mallabone, Paolo Maggi\nCopyright © 2004-2005 Paolo Maggi
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am
index 3500950c..9a83544d 100644
--- a/plugins/spell/Makefile.am
+++ b/plugins/spell/Makefile.am
@@ -33,8 +33,9 @@ ui_files = spell-checker.ui languages-dialog.ui pluma-spell-setup-dialog.ui
 include $(top_srcdir)/gla11y.mk
 ui_DATA = $(ui_files)
 
-plugin_in_files = spell.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = spell.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 $@
@@ -43,13 +44,13 @@ spell_gschema_in = org.mate.pluma.plugins.spell.gschema.xml.in
 gsettings_SCHEMAS = $(spell_gschema_in:.xml.in=.xml)
 @GSETTINGS_RULES@
 
-
 EXTRA_DIST = 					\
 	$(ui_DATA)				\
-	$(plugin_in_files)			\
+	$(plugin_in_in_files)			\
 	$(spell_gschema_in)			\
 	ui-a11y.suppr
 
 CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
+DISTCLEANFILES = $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/spell/spell.plugin.desktop.in b/plugins/spell/spell.plugin.desktop.in.in
index f020e753..dc8a1824 100644
--- a/plugins/spell/spell.plugin.desktop.in
+++ b/plugins/spell/spell.plugin.desktop.in.in
@@ -7,4 +7,4 @@ Description=Checks the spelling of the current document.
 Icon=tools-check-spelling
 Authors=Paolo Maggi <[email protected]>
 Copyright=Copyright © 2002-2005 Paolo Maggi
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
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.in
index 550dba2e..ee9ddbd5 100644
--- a/plugins/taglist/taglist.plugin.desktop.in
+++ b/plugins/taglist/taglist.plugin.desktop.in.in
@@ -5,4 +5,4 @@ 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 <[email protected]>
 Copyright=Copyright © 2002-2005 Paolo Maggi
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index 185d1a86..9b7b043f 100644
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -2,14 +2,14 @@
 plugindir = $(PLUMA_PLUGINS_LIBS_DIR)
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir) 				\
-	$(PLUMA_CFLAGS) 				\
+	-I$(top_srcdir) \
+	$(PLUMA_CFLAGS) \
 	$(WARN_CFLAGS)
 
 plugin_LTLIBRARIES = libtime.la
 
 libtime_la_SOURCES = \
-	pluma-time-plugin.h	\
+	pluma-time-plugin.h \
 	pluma-time-plugin.c
 
 libtime_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
@@ -17,13 +17,14 @@ libtime_la_LIBADD  = $(PLUMA_LIBS)
 
 uidir = $(PLUMA_PLUGINS_DATA_DIR)/time
 ui_files = \
-	pluma-time-dialog.ui				\
+	pluma-time-dialog.ui \
 	pluma-time-setup-dialog.ui
 include $(top_srcdir)/gla11y.mk
 ui_DATA = $(ui_files)
 
-plugin_in_files = time.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = time.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 $@
@@ -32,10 +33,9 @@ time_gschema_in = org.mate.pluma.plugins.time.gschema.xml.in
 gsettings_SCHEMAS = $(time_gschema_in:.xml.in=.xml)
 @GSETTINGS_RULES@
 
-EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(time_gschema_in) ui-a11y.suppr
-
-CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn)
-DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS)
+EXTRA_DIST = $(ui_DATA) $(plugin_in_in_files) $(time_gschema_in) ui-a11y.suppr
 
+CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS)
+DISTCLEANFILES = $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/time/time.plugin.desktop.in b/plugins/time/time.plugin.desktop.in.in
index 5c060665..9aa07115 100644
--- a/plugins/time/time.plugin.desktop.in
+++ b/plugins/time/time.plugin.desktop.in.in
@@ -5,4 +5,4 @@ Name=Insert Date/Time
 Description=Inserts current date and time at the cursor position.
 Authors=Paolo Maggi <[email protected]>;Lee Mallabone <[email protected]>
 Copyright=Copyright © 2002-2005 Paolo Maggi
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@
diff --git a/plugins/trailsave/Makefile.am b/plugins/trailsave/Makefile.am
index 45e80ab3..59306184 100644
--- a/plugins/trailsave/Makefile.am
+++ b/plugins/trailsave/Makefile.am
@@ -15,16 +15,16 @@ libtrailsave_la_SOURCES = \
 libtrailsave_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libtrailsave_la_LIBADD  = $(PLUMA_LIBS)
 
-plugin_in_files = trailsave.plugin.desktop.in
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+plugin_DATA = trailsave.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 $@
 
-EXTRA_DIST = $(plugin_in_files)
+EXTRA_DIST = $(plugin_in_in_files)
 
 CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
-
+DISTCLEANFILES = $(plugin_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/trailsave/trailsave.plugin.desktop.in b/plugins/trailsave/trailsave.plugin.desktop.in.in
index 86d2a600..2f54ec38 100644
--- a/plugins/trailsave/trailsave.plugin.desktop.in
+++ b/plugins/trailsave/trailsave.plugin.desktop.in.in
@@ -7,4 +7,4 @@ Description=Removes trailing spaces from lines before saving.
 Icon=edit-cut
 Authors=Marty Mills <[email protected]>
 Copyright=Copyright © 2015 Marty Mills
-Website=https://mate-desktop.org
+Website=@PACKAGE_URL@