From abd6ea2a55bb933b4e3c4f298b41643f5ee42069 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Thu, 20 Apr 2023 10:19:05 +0200
Subject: [PATCH] =?utf8?q?Makefile:=20Verwende=20`strip`=20f=C3=BCr=20Funk?=
 =?utf8?q?tionsargumente.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

In einem nächsten Schritt können wir so Funktionsaufrufe bequem umbrechen.
---
 Makefile | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 1dd12f6..709aa8b 100644
--- a/Makefile
+++ b/Makefile
@@ -382,7 +382,7 @@ $(DATADIR)/german-gesang.tr: $(DATADIR)/german.tr
 
 # $(1): pattern directory
 define make-full-pattern
-$(CHDIR) $(1) $(bsnl)\
+$(CHDIR) $(strip $(1)) $(bsnl)\
 && $(SH) $(SCRIPTDIR)/trennmuster/make-full-pattern.sh $(bsnl)\
   $(<F) $(GERMAN_TR)
 $(ECHO) done > $@
@@ -411,18 +411,18 @@ $(SWISSDIR)/make-full-pattern-swiss: $(SWISSDIR)/words.hyphenated.swiss
 # $(6): language tag
 define make-pat-file
 $(CAT) $(DATADIR)/kopf $(bsnl)\
-| $(SED) -e "s/@ENGLISH_TITLE@/$(3)/" $(bsnl)\
-         -e "s/@GERMAN_TITLE@/$(4)/" $(bsnl)\
+| $(SED) -e "s/@ENGLISH_TITLE@/$(strip $(3))/" $(bsnl)\
+         -e "s/@GERMAN_TITLE@/$(strip $(4))/" $(bsnl)\
          -e "s/@DATE@/$(DATE)/" $(bsnl)\
          -e "s/@GIT_VERSION@/$(GIT_VERSION)/" $(bsnl)\
-         -e "s/@LANG_NAME@/$(5)/" $(bsnl)\
-         -e "s/@LANG_TAG@/$(6)/" $(bsnl)\
+         -e "s/@LANG_NAME@/$(strip $(5))/" $(bsnl)\
+         -e "s/@LANG_TAG@/$(strip $(6))/" $(bsnl)\
          -e "s/@LEFTHYPHENMIN@/$(LEFTHYPHENMIN)/" $(bsnl)\
          -e "s/@RIGHTHYPHENMIN@/$(RIGHTHYPHENMIN)/" $(bsnl)\
-         -e "s/@FILE_NAME@/$(1)/" > $@ $(bsnl)\
-&& $(CAT) $(2)/pattern.rules >> $@ $(bsnl)\
+         -e "s/@FILE_NAME@/$(strip $(1))/" > $@ $(bsnl)\
+&& $(CAT) $(strip $(2))/pattern.rules >> $@ $(bsnl)\
 && $(CAT) $(DATADIR)/patterns-anfang >> $@ $(bsnl)\
-&& $(CAT) $(2)/pattern.8 >> $@ $(bsnl)\
+&& $(CAT) $(strip $(2))/pattern.8 >> $@ $(bsnl)\
 && $(CAT) $(DATADIR)/patterns-ende >> $@
 endef
 
@@ -442,7 +442,8 @@ $(SWISSDIR)/$(SWISS)-$(DATE).pat: \
 # $(1): arguments for `extract-tex.pl`
 define extract-tex
 $(CAT) $< $(bsnl)\
-| $(PERL) $(SCRIPTDIR)/wortliste/extract-tex.pl $(1) $(PERL_PATTYPE) $(bsnl)\
+| $(PERL) $(SCRIPTDIR)/wortliste/extract-tex.pl \
+            $(strip $(1)) $(PERL_PATTYPE) $(bsnl)\
 | $(SED_PATTYPE) $(bsnl)\
 | $(SORT) $(bsnl)\
 > $@
@@ -461,9 +462,9 @@ $(SWISSDIR)/words.hyphenated.swiss: $(WORDLIST)
 define make-tex-file
 $(CAT) $(DATADIR)/mantel.1 $(bsnl)\
   | $(SED) -e "s/@DATE@/$(DATE)/" $(bsnl)\
-           -e "s/@FILE_NAME@/$(1)/" > $@ $(bsnl)\
+           -e "s/@FILE_NAME@/$(strip $(1))/" > $@ $(bsnl)\
 && $(CAT) $(DATADIR)/mantel.2-$(TEX_WRAPPER_SUFFIX) $(bsnl)\
-  | LANG_TAG="$(shell echo $(2) | tr '[:upper:]' '[:lower:]')" \
+  | LANG_TAG="$(shell echo $(strip $(2)) | tr '[:upper:]' '[:lower:]')" \
     $(SED) "s/@LANG_TAG@/$$LANG_TAG/" >> $@ $(bsnl)\
 && $(CAT) $(DATADIR)/mantel.3 >> $@
 endef
@@ -563,7 +564,7 @@ LIGA = $(OUTDIR)/ligaturaufbruch
 # $(1): arguments for `-l` parameter of `sprachauszug.py`
 define ligaturaufbruch-eingabe
 $(MKDIR) $(LIGA)
-$(SPRACHAUSZUG) -l $(1) -s "morphemgrenzen,einfach" $(bsnl)\
+$(SPRACHAUSZUG) -l $(strip $(1)) -s "morphemgrenzen,einfach" $(bsnl)\
   $< > $@
 endef
 
-- 
2.11.4.GIT