]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
po-man: cleanup install
authorKarel Zak <kzak@redhat.com>
Wed, 22 Jan 2025 17:27:44 +0000 (18:27 +0100)
committerKarel Zak <kzak@redhat.com>
Wed, 12 Feb 2025 09:52:47 +0000 (10:52 +0100)
* 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>
Makefile.am
configure.ac
po-man/Makemodule.am
tools/poman-install.sh
tools/poman-translate.sh

index c1c0a54e4bb34624a61f26ed488d16db7719a4ba..daf2305488d5a4b4c2fcee508ee6b4222c526948 100644 (file)
@@ -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.
index ca76073736c656f8f6e277b66775bfb70935bbb3..ee4220b028338abf2575b35fd10210c39ad0bd02 100644 (file)
@@ -3085,7 +3085,6 @@ libsmartcols/docs/Makefile
 libsmartcols/docs/version.xml
 libsmartcols/src/libsmartcols.h
 po/Makefile.in
-po-man/Makefile
 ])
 
 AC_OUTPUT
index 601017f8d5c8474543b1b9295efd35bd06e69b68..b0c3c145a0e68d39ded59f8dbe45018e19224c15 100644 (file)
@@ -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
index aa31ca0b079d9e1b8ff1fad63cfdba28f855b92a..737e73a2534bce41fde8a77ff7ddf5883d1d6f46 100755 (executable)
@@ -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
index 426e6bfb29d8dcd1e0a39fee8c506a81d6365e6e..959eef65d86bda2069adfcd80095697624dbeb92 100755 (executable)
@@ -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")