From f86d107546952fdea5fc9fbceca915bfd4baad55 Mon Sep 17 00:00:00 2001 From: Michael Kohlhase Date: Fri, 20 Nov 2015 12:22:53 +0100 Subject: [PATCH] copying fixes over from sTeX --- lib/Makefile.ctan | 3 ++- lib/Makefile.in | 10 +++++----- lib/Makefile.vars | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/Makefile.ctan b/lib/Makefile.ctan index 6b5c150..d1b3ec1 100644 --- a/lib/Makefile.ctan +++ b/lib/Makefile.ctan @@ -18,7 +18,8 @@ HERE = $(shell pwd) TMP = /tmp -TDSCOLL ?= $(shell basename $$PWD) +#TDSCOLL ?= $(shell basename $$PWD) +TDSCOLL = proposal EXPORTED = $(TMP)/$(TDSCOLL).exp TDSDIR = $(TMP)/$(TDSCOLL).tds TDSZIP = $(TMP)/$(TDSCOLL).tds.zip diff --git a/lib/Makefile.in b/lib/Makefile.in index e530bcf..13b5f76 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -5,7 +5,7 @@ doc: $(DTX.pdf) $(EXAMPLE.pdf) $(EXAMPLE.pdf): %.pdf: %.tex $(DTX.sty) $(DTX.cls) $(IMG) $(EXAMPLE.deps) $(PDFLATEX) $(firstword $<) - @if (grep Citation $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ + @if (grep 'Please (re)run Biber' $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ then biber $(patsubst %.dtx, %, $(firstword $<));fi @if (grep "Writing index file" $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ then makeindex\ @@ -25,7 +25,7 @@ ltxml: $(DTX.ltxml) $(DTX.pdf): %.pdf: %.dtx $(IMG) $(PDFLATEX) $(patsubst %.pdf,%.ins,$@) $(PDFLATEX) $(firstword $<) - @if (grep Citation $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ + @if (grep 'Please (re)run Biber' $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ then biber $(patsubst %.dtx, %, $(firstword $<));fi @if (grep "Writing glossary file" $(patsubst %.dtx, %.log, $(firstword $<)) > /dev/null);\ then makeindex\ @@ -43,15 +43,15 @@ $(DTX.pdf): %.pdf: %.dtx $(IMG) $(DTX.sty): %.sty: %.ins %.dtx $(PDFLATEX) $< +$(DTX.cls): %.cls: %.ins %.dtx + $(PDFLATEX) $< + $(DTX.sty.ltxml): %.sty.ltxml: %.ins %.dtx $(PDFLATEX) $< $(DTX.cls.ltxml): %.cls.ltxml: %.ins %.dtx $(PDFLATEX) $< -$(DTX.cls): %.cls: %.ins %.dtx - $(PDFLATEX) $< - clean: rm -f *~ *.log *.ilg *.out *.glo *.idx *.ilg *.blg diff --git a/lib/Makefile.vars b/lib/Makefile.vars index d6337f1..d9a6169 100644 --- a/lib/Makefile.vars +++ b/lib/Makefile.vars @@ -24,6 +24,7 @@ CTANDIR = /tmp/$(TDSCOLL)/$(CTANPREFIX)$(PACKAGE) # the dependencies SOURCES = $(DTX.sty) $(BIB) TEXINPUTS := .:$(PREFIX)//: +BIBINPUTS := .:$(PREFIX)/../bib//: BSTINPUTS := .:$(PREFIX)//: # we want to quiet down pdflatex