summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-05-07 02:31:54 -0700
committerPhilipp Gesang <phg42.2a@gmail.com>2013-05-07 02:31:54 -0700
commitc2e7deb7254aae721ebefdc6c24ddb3e9913e537 (patch)
tree7beedb63909443eb7297e328d0c511d1fa092d94 /Makefile
parentef3dc20573a0b42272649a96193c4d67c1cca2b1 (diff)
parentd979da49344f89cf9a40b33c0a0b70a1a6d5ca00 (diff)
downloadlualibs-c2e7deb7254aae721ebefdc6c24ddb3e9913e537.tar.gz
Merge pull request #6 from phi-gamma/master
prepare release
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 4e79621..4c9edc3 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,12 @@ MODULES = $(wildcard lualibs-*.lua)
UNPACKED= lualibs.lua
COMPILED = $(DOC_DTX)
GENERATED = $(UNPACKED) $(DOC_DTX) $(MERGED)
-SOURCE = $(DTX) $(MODULES) README Makefile NEWS
+SOURCE = $(DTX) $(MODULES) LICENSE README Makefile NEWS
MERGED = lualibs-basic-merged.lua lualibs-extended-merged.lua
# Files grouped by installation location
RUNFILES = $(UNPACKED) $(MODULES)
-DOCFILES = $(DOC_DTX) README NEWS
+DOCFILES = $(DOC_DTX) LICENSE README NEWS
SRCFILES = $(DTX) $(SRC_TEX) Makefile
# The following definitions should be equivalent
@@ -32,11 +32,10 @@ CTAN_ZIP = $(NAME).zip
TDS_ZIP = $(NAME).tds.zip
ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
-DO_TEX = tex --interaction=batchmode $< >/dev/null
-DO_PDFLATEX = pdflatex --interaction=batchmode $< >/dev/null
-DO_PDFLUALATEX = pdflualatex --interaction=batchmode $< >/dev/null
-DO_MAKEINDEX = makeindex -s gind.ist $(subst .dtx,,$<) >/dev/null 2>&1
-DO_PACKAGE = mtxrun --script package --merge $< >/dev/null
+DO_TEX = luatex --interaction=batchmode $< >/dev/null
+DO_PDFLATEX = latexmk -pdf -e '$$pdflatex = q(lualatex %O %S)' -silent $< >/dev/null
+DO_MAKEINDEX = makeindex -s gind.ist $(subst .dtx,,$<) >/dev/null 2>&1
+DO_PACKAGE = mtxrun --script package --merge $< >/dev/null
all: $(GENERATED) $(DOC_TEX) $(MERGED)
doc: $(COMPILED)
@@ -59,7 +58,7 @@ world: all ctan
$(UNPACKED): lualibs.dtx
$(DO_TEX)
-$(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
+$(CTAN_ZIP): $(SOURCE) $(COMPILED) $(GENERATED) $(TDS_ZIP)
@echo "Making $@ for CTAN upload."
@$(RM) -- $@
@zip -9 $@ $^ >/dev/null