From: Karel Zak <kzak@redhat.com>
Date: Wed, 22 Jan 2025 17:27:44 +0000 (+0100)
Subject: po-man: cleanup install
X-Git-Tag: v2.42-start~47^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e700a33dd9b6542b679100f25baee9c717e364d;p=thirdparty%2Futil-linux.git

po-man: cleanup install

* Use autotools $(abs_ ) paths.
* Remove hidden path prefixes from poman-install.sh. Use $DESTDIR and
  $MESON_INSTALL_PREFIX on the poman-install.sh command line(--mandir).
* Use autotools compatible "install" calls (without -D).
* Add timestamp to autotools to avoid repeating "gen-poman" calls.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/Makefile.am b/Makefile.am
index c1c0a54e4..daf230548 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -291,6 +291,8 @@ gen-man:
 gen-man-dist:
 endif
 
+all-local: gen-man
+
 
 # Arrange so that .tarball-version appears only in the distribution
 # tarball, and never in a checked-out repository.
diff --git a/configure.ac b/configure.ac
index ca7607373..ee4220b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3085,7 +3085,6 @@ libsmartcols/docs/Makefile
 libsmartcols/docs/version.xml
 libsmartcols/src/libsmartcols.h
 po/Makefile.in
-po-man/Makefile
 ])
 
 AC_OUTPUT
diff --git a/po-man/Makemodule.am b/po-man/Makemodule.am
index 601017f8d..b0c3c145a 100644
--- a/po-man/Makemodule.am
+++ b/po-man/Makemodule.am
@@ -1,32 +1,37 @@
 if ENABLE_ASCIIDOC
 if ENABLE_POMAN
 
+PO_STAMPS = po4a-gen.stamp
 PO_FILES = po-man/$(wildcard *.po)
 
+CLEANFILES += $(PO_STAMPS)
+
 EXTRA_DIST += po-man/README.md \
 	      po-man/po4a.cfg \
 	      po-man/util-linux-man.pot \
 	      $(PO_FILES)
 
 
-asciidoc_poman_translate_cmd = $(top_srcdir)/tools/poman-translate.sh \
+asciidoc_poman_translate_cmd = $(abs_srcdir)/tools/poman-translate.sh \
 	--progress \
-	--srcdir '$(top_srcdir)/po-man' \
-	--destdir '$(top_builddir)/po-man/translations' \
-	--asciidoctor-load-path '$(top_srcdir)/tools' \
+	--srcdir '$(abs_srcdir)/po-man' \
+	--destdir '$(abs_builddir)/po-man/translations' \
+	--asciidoctor-load-path '$(abs_srcdir)/tools' \
 	--docdir '$(docdir)' \
-	--po4acfg '$(top_srcdir)/po-man/po4a.cfg' \
+	--po4acfg '$(abs_srcdir)/po-man/po4a.cfg' \
 	--util-linux-version '$(VERSION)'
 
-asciidoc_poman_install_cmd = $(top_srcdir)/tools/poman-install.sh \
-	--mandir '$(DESTDIR)/$(mandir)' \
-	--mansrcdir '$(top_builddir)/po-man/translations/man'
-
+asciidoc_poman_install_cmd = $(abs_srcdir)/tools/poman-install.sh \
+	--mandir '$(DESTDIR)$(mandir)' \
+	--mansrcdir '$(abs_builddir)/po-man/translations/man'
 
 ADOCFILES = $(MANPAGES:=.adoc)
-gen-poman: $(ADOCFILES_COMMON) $(ADOCFILES)
+
+po4a-gen.stamp: $(PO_FILES) $(ADOCFILES_COMMON) $(ADOCFILES)
 	$(asciidoc_poman_translate_cmd) $(ADOCFILES)
+	@touch po4a-gen.stamp
 
+gen-poman: $(PO_STAMPS)
 
 install-data-hook-poman:
 	$(asciidoc_poman_install_cmd) --install
diff --git a/tools/poman-install.sh b/tools/poman-install.sh
index aa31ca0b0..737e73a25 100755
--- a/tools/poman-install.sh
+++ b/tools/poman-install.sh
@@ -21,7 +21,6 @@ Install translated man pages.
 HEREDOC
 }
 
-MESON_INSTALL_PREFIX="${MESON_INSTALL_PREFIX:-''}"
 MANPAGES=()
 PROGRAM=$(basename "$0")
 MYCMD="install"
@@ -79,12 +78,13 @@ for LOCALEDIR in "$MANSRCDIR"/*/; do
 
 	    if [ "$MYCMD" = "install" ]; then
                 if [ -z ${MESON_INSTALL_QUIET+x} ]; then
-                    echo "Installing $PAGE to $MESON_INSTALL_PREFIX/$MANDIR/$LOCALE/man$SECTION"
+			echo "Installing $PAGE to ${MANDIR}/$LOCALE/man$SECTION"
                 fi
-                install -D --mode=0644 --target-directory="$DESTDIR/$MESON_INSTALL_PREFIX/$MANDIR/$LOCALE/man$SECTION" "$PAGE"
+		mkdir -p "${MANDIR}/$LOCALE/man$SECTION"
+                install -m 644 "$PAGE" "${MANDIR}/$LOCALE/man$SECTION"
 
 	    elif [ "$MYCMD" = "uninstall" ]; then
-		rm -f "$DESTDIR/$MESON_INSTALL_PREFIX/$MANDIR/$LOCALE/man$SECTION/$PAGE"
+		rm -f "${MANDIR}/$LOCALE/man$SECTION/$PAGE"
 	    fi
         fi
     done
diff --git a/tools/poman-translate.sh b/tools/poman-translate.sh
index 426e6bfb2..959eef65d 100755
--- a/tools/poman-translate.sh
+++ b/tools/poman-translate.sh
@@ -91,7 +91,7 @@ PO4A_TRANSLATE_ONLY_FLAGS=()
 for LOCALE in "${LOCALES[@]}"; do
     for ADOC in "${ADOCS[@]}"; do
         if [[ ! " ${PO4ACFG_TRANSLATIONS[*]} " =~ .*${ADOC}[[:space:]] ]]; then
-	  echo "Ignore $ADOC"
+	  echo "Untranslated: $LOCALE: $ADOC"
           continue
         fi
         PO4A_TRANSLATE_ONLY_FLAGS+=("--translate-only")