From 197e905604536d7f320963ae2e167f46d9ba77b5 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 1 Dec 2015 10:49:31 +0100 Subject: [PATCH] replace the sed command for the git revision with something that does not trigger a newline with gnu sed... --- Makefile | 4 +++- src/singalongs.tex | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index eac8d6a..7a2af2e 100644 --- a/Makefile +++ b/Makefile @@ -50,13 +50,15 @@ book: $(BOOKPDF) booklet: $(BOOKLETPDF) +SSS=\newcommand + $(BOOKPDF): | $(PDFDIR) $(OUTDIR) @$(CP) $(SRCDIR)/*.tex $(OUTDIR)/ @$(CP) -r lib/* $(OUTDIR)/ @$(CP) -r $(SRCDIR)/images $(OUTDIR)/images @$(SED) "s;\musicbooklet;$(LILYPONDSUBST);g" $(SRCDIR)/singalongs.tex > $(OUTPUTFILE).00 - @$(SED) 's;\input{revision.tex};\newcommand{\\revision}{ $(shell git log -1 --format="%h") };g' $(OUTPUTFILE).00 > $(OUTPUTFILE) + @$(SED) 's/REVISION/$(shell git log -1 --format="%h")/g' $(OUTPUTFILE).00 > $(OUTPUTFILE) @$(CD) $(OUTDIR); \ $(LUALATEX) -shell-escape singalongs.tex; \ diff --git a/src/singalongs.tex b/src/singalongs.tex index 4e9de30..21e0316 100644 --- a/src/singalongs.tex +++ b/src/singalongs.tex @@ -10,7 +10,7 @@ \usepackage{multicol} \usepackage{lyluatex} -\input{revision.tex} +\newcommand {\revision}{ REVISION } \input{settings.tex} \input{headfoot.tex}