From 7587a4f62114a853e89b73336094b1e2d701ca54 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Sun, 5 May 2013 19:32:23 +0200
Subject: update makefile

---
 Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4e79621..a3d2e22 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 	= lualatex   --interaction=batchmode $< >/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)
-- 
cgit v1.2.3


From 92672ed1f12f18abb2d5032aec1cd822f572231d Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Sun, 5 May 2013 22:40:32 +0200
Subject: Makefile: include lualibs.lua in CTAN rule

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a3d2e22..70244f1 100644
--- a/Makefile
+++ b/Makefile
@@ -58,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
-- 
cgit v1.2.3


From d979da49344f89cf9a40b33c0a0b70a1a6d5ca00 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Tue, 7 May 2013 11:30:03 +0200
Subject: fix Makefile; doc as toc again

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 70244f1..4c9edc3 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ TDS_ZIP = $(NAME).tds.zip
 ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
 
 DO_TEX 			= luatex     --interaction=batchmode $< >/dev/null
-DO_PDFLATEX 	= lualatex   --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
 
-- 
cgit v1.2.3