From e3724422565a725b2288d9dc8894b48bf2b8c4a0 Mon Sep 17 00:00:00 2001
From: Jesse <jsmith@resonatingmedia.com>
Date: Tue, 23 Aug 2022 15:08:13 -0300
Subject: [PATCH] Fix typo in man/po/es.po Clean up src/Makefile translation
 code.

---
 doc/Changelog |  6 +++++-
 man/po/es.po  |  2 +-
 src/Makefile  | 24 ++++++++----------------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 7847cee..52bad8b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,4 +1,8 @@
-sysvinit (3.05) unreleased; urgency=low
+sysvinit (3.06) unreleased; urgency=low
+    * Mark Hindley fixed typo in es.po
+    * Mark Hindley cleaned up translation code in src/Makefile. 
+
+sysvinit (3.05) released; urgency=low
     * Helge Kreutzmann provided updated Makefile for
       translation of manual pages. This has been added
       to the man directory.
diff --git a/man/po/es.po b/man/po/es.po
index 14433e2..f669047 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -2477,7 +2477,7 @@ msgid ""
 "Michael Haardt E<.ME .>"
 msgstr ""
 "B<Init> fue escrito por E<.MT miquels@\\:cistron\\:.nl> Miquel van "
-"Smoorenburg E<.ME>.  Esta página de manual fue escrita por E<.MT lederer@\\:"
+"Smoorenburg E<.ME .>  Esta página de manual fue escrita por E<.MT lederer@\\:"
 "francium\\:.informatik\\:.uni-bonn\\:.de> Sebastian Lederer E<.ME> y "
 "modificada por E<.MT u31b3hs@\\:pool\\:.informatik\\:.rwth-aachen\\:.de> "
 "Michael Haardt E<.ME .>"
diff --git a/src/Makefile b/src/Makefile
index d0d8ed9..cb9a638 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -65,6 +65,9 @@ BIN	+= mountpoint
 MAN1	+= mountpoint.1
 endif
 
+MANPAGES:=$(MAN1) $(MAN5) $(MAN8)
+MANPAGES+=$(subst ../man/,,$(foreach man,$(MANPAGES),$(wildcard ../man/??/$(man))))
+
 ID		= $(shell id -u)
 BIN_OWNER	= root
 BIN_GROUP	= root
@@ -214,22 +217,11 @@ install:	all
 		fi
 		$(INSTALL_DIR) $(ROOT)/usr/include/
 		$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
-		for lang in  '' $(patsubst ../man/po/%.po,%,$(wildcard ../man/po/??.po)); do \
-			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/$$lang; \
-			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/$$lang; \
-			$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/$$lang; \
-		done
-		for man in $(MAN1) $(subst ../man/,,$(foreach man,$(MAN1),$(wildcard ../man/??/$(man)))); do \
-			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man1/$$man; \
-			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man1/$$man ; \
-		done
-		for man in $(MAN5) $(subst ../man/,,$(foreach man,$(MAN5),$(wildcard ../man/??/$(man)))); do \
-			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/$$man; \
-			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man5/$$man ; \
-		done
-		for man in $(MAN8) $(subst ../man/,,$(foreach man,$(MAN8),$(wildcard ../man/??/$(man)))); do \
-			$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/$$man; \
-			sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man8/$$man ; \
+		for man in $(MANPAGES) ; do \
+		    targetdir=$(ROOT)$(MANDIR)/$$(dirname $$man)/man$${man##*.}; \
+		    $(INSTALL_DIR) $$targetdir; \
+		    $(INSTALL_DATA) ../man/$$man $$targetdir/$$(basename $$man); \
+		    sed -i "1{ $(MANDB); }" $$targetdir/$$(basename $$man); \
 		done
 ifeq ($(ROOT),)
 		#