From 8b25dbdca209d22aa0905d8f9a1ee767d2a569ba Mon Sep 17 00:00:00 2001 From: Emil Miler Date: Sat, 1 Jun 2024 11:53:13 +0200 Subject: [PATCH] Use shell to invoke ChordPro This allows us to run the makefile with or without a shell function with Docker. This should work both locally and during build in the pipeline. --- makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 4258e48..afc34be 100644 --- a/makefile +++ b/makefile @@ -6,13 +6,15 @@ SONG_PDF := $(patsubst %$(SRC_EXTENSION),%.pdf,$(SONG_CHO)) SONG_HTML := $(patsubst %$(SRC_EXTENSION),%.html,$(SONG_CHO)) SONGBOOK := songbook.pdf +SHELL := $(shell echo $$SHELL) + .DEFAULT_GOAL := all %.pdf: %$(SRC_EXTENSION) - chordpro --config=chordpro.json -o $@ $< + $(SHELL) -c 'chordpro --config=chordpro.json -o $@ $<' %.html: %$(SRC_EXTENSION) - chordpro --config=chordpro.json -o $@ $< + $(SHELL) -c 'chordpro --config=chordpro.json -o $@ $<' all: $(SONG_PDF) $(SONG_HTML) $(SONGBOOK)