From fa98837b1d9586b9ca7bf77dae22c3bde0fc59b5 Mon Sep 17 00:00:00 2001
From: Florian Pelz <pelzflorian@pelzflorian.de>
Date: Mon, 1 Apr 2024 00:54:32 +0200
Subject: nls: Update translations.

* po/guix/ar.po: New file.
* po/guix/LINGUAS: Add 'ar'.
* po/doc/guix-cookbook.pt_BR.po: New file.
* po/doc/local.mk: Add 'pt_BR' cookbook.
* doc/local.mk: Add 'pt_BR' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'ko', 'pt_BR'.
* doc/guix-cookbook.texi (Top): Mention 'ko', 'pt_BR' cookbook.

Change-Id: Id1846ca100263b3fc1fa2ed52654c670270ee809
---
 doc/local.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc/local.mk')

diff --git a/doc/local.mk b/doc/local.mk
index 97f0c3a92a..0ff317a19e 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -23,7 +23,7 @@
 
 # If adding a language, update the following variables, and info_TEXINFOS.
 MANUAL_LANGUAGES = de es fr pt_BR ru zh_CN
-COOKBOOK_LANGUAGES = de fr ko sk
+COOKBOOK_LANGUAGES = de fr ko pt_BR sk
 
 # Arg1: A list of languages codes.
 # Arg2: The file name stem.
@@ -42,6 +42,7 @@ info_TEXINFOS = %D%/guix.texi			\
   %D%/guix-cookbook.de.texi			\
   %D%/guix-cookbook.fr.texi			\
   %D%/guix-cookbook.ko.texi			\
+  %D%/guix-cookbook.pt_BR.texi			\
   %D%/guix-cookbook.sk.texi
 
 %C%_guix_TEXINFOS = \
-- 
cgit v1.2.3


From df64d48e6f9f648044aa5279c045b8d6f7bee604 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 3 Apr 2024 16:16:00 +0200
Subject: maint: Fix help2man for guix subcommands with `make V=2'.

* doc/local.mk ($(srcdir)/%D%/guix-%.1): Use AM_V_HELP2MAN and cater for
make's `@' silencing at the start of the command.

Change-Id: Id80c48f0d7697167fea64700a7fe140003732d28
---
 doc/local.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'doc/local.mk')

diff --git a/doc/local.mk b/doc/local.mk
index 0ff317a19e..8df003b891 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -232,10 +232,9 @@ $(srcdir)/%D%/guix.1: scripts/guix.in $(sub_commands_mans)
 # prerequisite is solely meant to force these docs to be made only after all
 # Guile modules have been compiled.  We also need the guix script to exist.
 $(srcdir)/%D%/guix-%.1: guix/scripts/%.scm $(GOBJECTS) scripts/guix
-	-@case '$?' in \
-	  *$<*) $(AM_V_P) && set -x || echo "  HELP2MAN $@"; \
-	        $(gen_man) --output="$@" "guix $*";; \
-	  *)    : ;; \
+	-@case '$?' in								\
+	  *$<*) $(AM_V_HELP2MAN:@%=%)$(gen_man) --output="$@" "guix $*";;	\
+	  *)    : ;;								\
 	esac
 
 if BUILD_DAEMON
-- 
cgit v1.2.3