46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From 02b200c9aa501ad4e1651c553cea1aaf9e5e0f4f Mon Sep 17 00:00:00 2001
|
|
From: Serge Hallyn <serge@hallyn.com>
|
|
Date: Sat, 14 Aug 2021 14:24:03 -0500
|
|
Subject: [PATCH] man/po/Makefile.in: switch from xml2po to itstool
|
|
|
|
xml2po is deprecated. We've previously replaced xml2po with
|
|
itstool in man/generate_translations.mak, but there was still
|
|
an instance of it that only is exercised for 'make dist'.
|
|
Update that one. Now 'make dist' succeeds on a ubuntu focal
|
|
or newer host where xml2po is not available.
|
|
|
|
Signed-off-by: Serge Hallyn <serge@hallyn.com>
|
|
|
|
Conflict: NA
|
|
Reference: https://github.com/shadow-maint/shadow/commit/02b200c9aa501ad4e1651c553cea1aaf9e5e0f4f
|
|
|
|
---
|
|
man/po/Makefile.in | 14 +++++++++++---
|
|
1 file changed, 11 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/man/po/Makefile.in b/man/po/Makefile.in
|
|
index deaa87058..f194957b4 100644
|
|
--- a/man/po/Makefile.in
|
|
+++ b/man/po/Makefile.in
|
|
@@ -90,9 +90,17 @@ $(DOMAIN).pot-update: $(XMLFILES) $(srcdir)/XMLFILES remove-potcdate.sed
|
|
@set -e; tmpdir=`pwd`; \
|
|
echo "cd $(top_srcdir)/man"; \
|
|
cd $(top_srcdir)/man; \
|
|
- echo "xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(XMLFILES))"; \
|
|
- xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(XMLFILES)); \
|
|
- cd $$tmpdir
|
|
+ files=""; \
|
|
+ for file in $(notdir $(XMLFILES)); do \
|
|
+ if grep -q SHADOW-CONFIG-HERE $$file ; then \
|
|
+ sed -e 's/^<!-- SHADOW-CONFIG-HERE -->/<!ENTITY % config SYSTEM "config.xml">%config;/' $$file > $$file.out; \
|
|
+ else \
|
|
+ sed -e 's/^\(<!DOCTYPE .*docbookx.dtd"\)>/\1 [<!ENTITY % config SYSTEM "config.xml">%config;]>/' $$file > $$file.out; \
|
|
+ fi; \
|
|
+ files="$$files $$file.out"; \
|
|
+ done; \
|
|
+ itstool -d -o $$tmpdir/$(DOMAIN).po $$files; \
|
|
+ cd $$tmpdir; \
|
|
test ! -f $(DOMAIN).po || { \
|
|
if test -f $(srcdir)/$(DOMAIN).pot; then \
|
|
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
|