Skip to content

Commit bf5ffaa

Browse files
committed
Fix Makefile for win32 and CI/CD
1 parent 0c18fd6 commit bf5ffaa

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

Makefile

+12-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ CONTRIBUTION = gitinfo-lua
22
VERSION = $(shell git describe --tags --always)
33
FILE = ${CONTRIBUTION}-${VERSION}.tar.gz
44
MANUAL = doc/${CONTRIBUTION}
5-
COMPILER = lualatex --shell-escape --interaction=nonstopmode
5+
CNF_LINE = -cnf-line TEXMFHOME={${CURDIR},$(shell kpsewhich --var-value TEXMFHOME)}
6+
COMPILER = lualatex --shell-escape --interaction=nonstopmode $(CNF_LINE)
7+
RM = rm
8+
ifeq ($(OS),Windows_NT)
9+
RM = del
10+
endif
611

712
TEST_PROJECT ?= ../git-test-project
813

@@ -15,11 +20,11 @@ build: ${MANUAL}.pdf
1520
scenario: ${TEST_PROJECT}
1621

1722
clean:
18-
cd doc && latexmk -c 2> /dev/null
23+
cd doc && latexmk -c
1924

2025
clean-all:
21-
cd doc && latexmk -C 2> /dev/null && \
22-
rm -f ${FILE}
26+
cd doc && latexmk -C && \
27+
$(RM) -f ${FILE}
2328

2429
${TEST_PROJECT}:
2530
mkdir -p ${TEST_PROJECT}
@@ -33,10 +38,11 @@ ${MANUAL}.aux: ${MANUAL}.tex
3338
${MANUAL}.idx: ${MANUAL}.aux
3439
cd doc && makeindex -s gind.ist ${CONTRIBUTION}.idx
3540

36-
${MANUAL}.pdf: scenario ${MANUAL}.idx ${MANUAL}.tex tex/$(wildcard *.sty) scripts/$(wildcard *.lua)
41+
${MANUAL}.pdf: scenario ${MANUAL}.idx ${MANUAL}.tex $(wildcard tex/*.sty) $(wildcard scripts/*.lua)
3742
@echo "Creating documentation PDF"
3843
cd doc && $(COMPILER) ${CONTRIBUTION}
39-
while grep 'Rerun to get ' doc/${CONTRIBUTION}.log ; do cd doc && $(COMPILER) ${CONTRIBUTION} ; done
44+
45+
# while grep 'Rerun to get ' doc/${CONTRIBUTION}.log ; do cd doc && $(COMPILER) ${CONTRIBUTION} ; done
4046

4147
${FILE}: ${MANUAL}.pdf clean
4248
@echo "Creating package tarball"

doc/gitinfo-lua.tex

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
% gitinfo-cmd.lua and gitinfo-lua.lua
1818
\documentclass{ltxdoc}
1919
\usepackage[english]{babel}
20-
\usepackage[titlepage,authors]{../tex/gitinfo-lua}
20+
\usepackage[titlepage,authors]{gitinfo-lua}
2121

2222
\usepackage{listings}
2323
\lstset{

0 commit comments

Comments
 (0)