Applied patches from Mark Hindley to clean up man page

Makefile, translations and installs of new man pages.
This commit is contained in:
Jesse 2022-05-09 12:48:54 -03:00
parent 746b0fc6a9
commit 08810d78ff
4 changed files with 30 additions and 25 deletions

View File

@ -4,6 +4,8 @@ sysvinit (3.05) unreleased; urgency=low
to the man directory. to the man directory.
* Added sys/sysmacros.h include in mountpoint.c to fix * Added sys/sysmacros.h include in mountpoint.c to fix
compiler errors on systems where major/minor macros were not defined. compiler errors on systems where major/minor macros were not defined.
* Applied patches from Mark Hindley to clean up man page
Makefile, translations and installs of new man pages.
sysvinit (3.04) released; urgency=low sysvinit (3.04) released; urgency=low
* Mark Hindley supplied patch to make bootlogd compile * Mark Hindley supplied patch to make bootlogd compile

View File

@ -3,25 +3,26 @@ killall5.8 last.1 lastb.1 logsave.8 mesg.1 mountpoint.1 pidof.8 poweroff.8 \
readbootlog.1 reboot.8 runlevel.8 shutdown.8 sulogin.8 telinit.8 utmpdump.1 \ readbootlog.1 reboot.8 runlevel.8 shutdown.8 sulogin.8 telinit.8 utmpdump.1 \
wall.1 wall.1
LANGUAGES_DIST =`sed -ne 's/^.*\[po4a_langs\] \(.*\)$/\1/p' po/po4a.cfg` LANGUAGES=$(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' po/po4a.cfg)
LANGUAGES=$(LANGUAGES_DIST)
LANGUAGES=de es fi fr hu id pl
VERSION?=1.2.3 PO4A := $(shell command -v po4a 2> /dev/null)
PO4A_OPTS = --previous --srcdir po/ --destdir ./ --no-backups --stamp \
--package-name sysvinit --package-version $(VERSION)
PO4A_OPTS = --previous --srcdir po/ --destdir po/ --no-backups \ all:
--package-name sysvinit --package-version $(VERSION) \
--msgid-bugs-address "Your Bugmail <mail@example.com>"
translated:
po4a $(PO4A_OPTS) po/po4a.cfg
all install: translated
sed --in-place=.orig --separate 's/\@VERSION\@/$(VERSION)/g' $(MANPAGES) sed --in-place=.orig --separate 's/\@VERSION\@/$(VERSION)/g' $(MANPAGES)
ifdef PO4A
po4a $(PO4A_OPTS) po/po4a.cfg
else
@echo 'Install po4a to build translated manpages'
endif
# Installation recipes are in ../src/Makefile
install: all
clean distclean: clean distclean:
for man in $(MANPAGES) ; do \ for man in $(MANPAGES) ; do \
if [ -f "$$man.orig" ] ; then mv "$$man.orig" "$$man" ; fi \ if [ -f "$$man.orig" ] ; then mv "$$man.orig" "$$man" ; fi \
done done
for lang in $(LANGUAGES) ; do rm -rf "po/$$lang" ; done for lang in $(LANGUAGES) ; do rm -rf "$$lang" "$$lang.po" ; done

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: sysvinit 1.2.3\n" "Project-Id-Version: sysvinit 3.05\n"
"Report-Msgid-Bugs-To: Your Bugmail <mail@example.com>\n" "Report-Msgid-Bugs-To: Your Bugmail <mail@example.com>\n"
"POT-Creation-Date: 2022-05-01 15:59-0300\n" "POT-Creation-Date: 2022-05-09 12:43-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

View File

@ -214,19 +214,21 @@ install: all
fi fi
$(INSTALL_DIR) $(ROOT)/usr/include/ $(INSTALL_DIR) $(ROOT)/usr/include/
$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/ $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/ for lang in '' $(subst ../man/,,$(wildcard ../man/po/??/)); do \
$(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/$$lang; \
$(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/$$lang; \
for man in $(MAN1); do \ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/$$lang; \
$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man1/; \ 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 ; \ sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man1/$$man ; \
done done
for man in $(MAN5); do \ for man in $(MAN5) $(subst ../man/,,$(foreach man,$(MAN5),$(wildcard ../man/??/$(man)))); do \
$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/; \ $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man5/$$man; \
sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man5/$$man ; \ sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man5/$$man ; \
done done
for man in $(MAN8); do \ for man in $(MAN8) $(subst ../man/,,$(foreach man,$(MAN8),$(wildcard ../man/??/$(man)))); do \
$(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/; \ $(INSTALL_DATA) ../man/$$man $(ROOT)$(MANDIR)/man8/$$man; \
sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man8/$$man ; \ sed -i "1{ $(MANDB); }" $(ROOT)$(MANDIR)/man8/$$man ; \
done done
ifeq ($(ROOT),) ifeq ($(ROOT),)