From 6d574d94f9a3c0a95138333777366a185741e2f4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 31 Jul 2025 21:30:11 +0200 Subject: [PATCH] make: improve the installation of the fluent files --- GNUmakefile | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index e80d3aa7a..3832f1634 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -418,25 +418,29 @@ endif ifeq ($(LOCALES),y) locales: - $(foreach prog, $(INSTALLEES), \ - if [ -d "$(BASEDIR)/src/uu/$(prog)/locales" ]; then \ - mkdir -p "$(BUILDDIR)/locales/$(prog)"; \ - for locale_file in "$(BASEDIR)"/src/uu/$(prog)/locales/*.ftl; do \ - $(INSTALL) -v "$$locale_file" "$(BUILDDIR)/locales/$(prog)/"; \ + @for prog in $(INSTALLEES); do \ + if [ -d "$(BASEDIR)/src/uu/$$prog/locales" ]; then \ + mkdir -p "$(BUILDDIR)/locales/$$prog"; \ + for locale_file in "$(BASEDIR)"/src/uu/$$prog/locales/*.ftl; do \ + if [ "$$(basename "$$locale_file")" != "en-US.ftl" ]; then \ + $(INSTALL) -v "$$locale_file" "$(BUILDDIR)/locales/$$prog/"; \ + fi; \ done; \ - fi $(newline) \ - ) + fi; \ + done install-locales: - $(foreach prog, $(INSTALLEES), \ - if [ -d "$(BASEDIR)/src/uu/$(prog)/locales" ]; then \ - mkdir -p "$(DESTDIR)$(DATAROOTDIR)/locales/$(prog)"; \ - for locale_file in "$(BASEDIR)"/src/uu/$(prog)/locales/*.ftl; do \ - $(INSTALL) -v "$$locale_file" "$(DESTDIR)$(DATAROOTDIR)/locales/$(prog)/"; \ + @for prog in $(INSTALLEES); do \ + if [ -d "$(BASEDIR)/src/uu/$$prog/locales" ]; then \ + mkdir -p "$(DESTDIR)$(DATAROOTDIR)/locales/$$prog"; \ + for locale_file in "$(BASEDIR)"/src/uu/$$prog/locales/*.ftl; do \ + if [ "$$(basename "$$locale_file")" != "en-US.ftl" ]; then \ + $(INSTALL) -v "$$locale_file" "$(DESTDIR)$(DATAROOTDIR)/locales/$$prog/"; \ + fi; \ done; \ - fi $(newline) \ - ) + fi; \ + done else install-locales: endif