From da39eb33d79d93dd1e31fdfbe756d27ff45d5765 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 25 Jan 2023 11:59:55 +0100 Subject: [PATCH] =?utf8?q?Makefile:=20Besserer=20Standardwert=20f=C3=BCr?= =?utf8?q?=20`SRCDIR`,=20neue=20Variable=20`OUTDIR`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Der neue Wert für `SRCDIR` leitet sich jetzt direkt von dem Verzeichnis ab, in dem sich die Makefile-Datei befindet. --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index bde8cef..bb8ec7e 100644 --- a/Makefile +++ b/Makefile @@ -75,12 +75,14 @@ W = 0 -SRCDIR = . +SRCDIR = $(dir $(realpath $(lastword $(MAKEFILE_LIST)))) DATADIR = $(SRCDIR)/daten SCRIPTDIR = $(SRCDIR)/skripte LANGSDIR = $(SCRIPTDIR)/spezialmuster/lang_s WORDLIST = $(SRCDIR)/wortliste +OUTDIR = ./muster + .PHONY: major fugen suffix ifneq ($(findstring major,$(MAKECMDGOALS)),) @@ -146,7 +148,7 @@ TRAD = dehypht-x$(MAJOR) REFO = dehyphn-x$(MAJOR) SWISS = dehyphts-x$(MAJOR) LATF = de-Latf -LIGA = muster/ligaturaufbruch +LIGA = $(OUTDIR)/ligaturaufbruch LC_ENVVARS = LC_COLLATE=de_DE.UTF-8 \ LC_CTYPE=de_DE.UTF-8 @@ -173,9 +175,9 @@ RIGHTHYPHENMIN = $(strip $(shell $(SED) 's/^..\(..\).*/\1/;q' < $(DATADIR)/germa GIT_VERSION := `$(CHDIR) $(SRCDIR) \ && $(GIT) log --format=%H -1 HEAD --` -TRADDIR = muster/$(TRAD) -REFODIR = muster/$(REFO) -SWISSDIR = muster/$(SWISS) +TRADDIR = $(OUTDIR)/$(TRAD) +REFODIR = $(OUTDIR)/$(REFO) +SWISSDIR = $(OUTDIR)/$(SWISS) TRADFILES = $(TRADDIR)/$(TRAD)-$(DATE).pat $(TRADDIR)/$(TRAD)-$(DATE).tex REFOFILES = $(REFODIR)/$(REFO)-$(DATE).pat $(REFODIR)/$(REFO)-$(DATE).tex SWISSFILES = $(SWISSDIR)/$(SWISS)-$(DATE).pat $(SWISSDIR)/$(SWISS)-$(DATE).tex -- 2.11.4.GIT