fix installation

partial revert of 67e21ea

Install to /usr/share/help/mate-user-guide-content
is really a bad idea.

4 files changed, 6 insertions, 7 deletions

diff --git a/.tx/config b/.tx/config
index cada4cc..d1fe67e 100644
--- a/.tx/config
+++ b/.tx/config
@@ -10,7 +10,7 @@ minimum_perc = 2
 
 [MATE.master--mate-user-guide-content]
 file_filter = mate-user-guide/<lang>/<lang>.po
-source_file = mate-user-guide-content.pot
+source_file = mate-user-guide/mate-user-guide.pot
 source_lang = en
 type = PO
 minimum_perc = 2
diff --git a/makepot b/makepot
index 63248d3..e3d58b8 100755
--- a/makepot
+++ b/makepot
@@ -1,10 +1,9 @@
 #! /bin/sh
 
 PACKAGE=mate-user-guide;
-PACKAGE_CONTENT=mate-user-guide-content;
 
 # normal translations for the package
 make -C po $PACKAGE.pot && mv po/$PACKAGE.pot .
 
 # translations for the quide itself
-make -C $PACKAGE $PACKAGE_CONTENT.pot && mv $PACKAGE/$PACKAGE_CONTENT.pot .
+make -C $PACKAGE $PACKAGE.pot
diff --git a/mate-user-guide/Makefile.am b/mate-user-guide/Makefile.am
index e4dea87..846fb1c 100644
--- a/mate-user-guide/Makefile.am
+++ b/mate-user-guide/Makefile.am
@@ -1,6 +1,6 @@
 @YELP_HELP_RULES@
 
-HELP_ID = mate-user-guide-content
+HELP_ID = mate-user-guide
 HELP_FILES = index.docbook	\
 	legal.xml		\
 	gosbasic.xml		\
diff --git a/mate-user-guide-content.pot b/mate-user-guide/mate-user-guide.pot
index da11fc3..a6827f6 100644
--- a/mate-user-guide-content.pot
+++ b/mate-user-guide/mate-user-guide.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: MATE Desktop Environment\n"
-"POT-Creation-Date: 2018-09-23 20:43+0200\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2018-09-24 22:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -13036,7 +13036,7 @@ msgstr ""
 #. whatever you like once you have updated your copy of the file.
 #: C/gospanel.xml:1570
 msgctxt "_"
-msgid "external ref='figures/menu_bar_applet.png' md5='dd0eee59732d5d03d0f90299ef9fa1bd'"
+msgid "external ref='figures/menu_bar_applet.png' md5='8f4bca946498664c1cddd238a5a23498'"
 msgstr ""
 
 #. (itstool) path: screenshot/mediaobject