From e8016ee1a59d7d5921bc4918a65ce6a37a4b07e7 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Thu, 2 Jan 2014 21:32:41 +0100 Subject: [*] excise test-related make rules --- Makefile | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2d618e7..aec2ac0 100644 --- a/Makefile +++ b/Makefile @@ -34,12 +34,6 @@ UNPACKED = luaotfload.sty luaotfload.lua GENERATED = $(GRAPHED) $(UNPACKED) $(COMPILED) $(RESOURCES) $(MAN) SOURCE = $(DTX) $(MANSOURCE) $(OTFL) README Makefile NEWS $(RESOURCESCRIPTS) -# test files -TESTDIR = tests -TESTSTATUS = $(wildcard $(TESTDIR)/*.tex $(TESTDIR)/*.ltx) -TESTSTATUS_SYS = $(TESTDIR)/systemfonts.tex $(TESTDIR)/fontconfig_conf_reading.tex -TESTSTATUS_TL = $(filter-out $(TESTSTATUS_SYS), $(TESTSTATUS)) - # Files grouped by installation location SCRIPTSTATUS = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS) RUNSTATUS = $(UNPACKED) $(filter-out $(SCRIPTSTATUS),$(OTFL)) @@ -146,21 +140,6 @@ install: $(ALL_STATUS) @echo "Installing in '$(TEXMFROOT)'." $(run-install) -check: $(RUNSTATUS) $(TESTSTATUS_TL) - @rm -rf var - @for f in $(TESTSTATUS_TL); do \ - echo "check: luatex $$f"; \ - luatex --interaction=batchmode $$f \ - > /dev/null || exit $$?; \ - done - -check-all: $(TESTSTATUS_SYS) check - @cd $(TESTDIR); for f in $(TESTSTATUS_SYS); do \ - echo "check: luatex $$f"; \ - $(TESTENV) luatex --interaction=batchmode ../$$f \ - > /dev/null || exit $$?; \ - done - manifest: @echo "Source files:" @for f in $(SOURCE); do echo $$f; done @@ -169,9 +148,9 @@ manifest: @for f in $(GENERATED); do echo $$f; done clean: - @$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out $(TESTDIR)/*.log + @$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out mrproper: clean - @$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE) $(TESTDIR)/*.pdf + @$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE) @$(RM) -r -- $(DISTDIR) -- cgit v1.2.3 From 2da71ff00e1533aa6ca1c317ec89e70655f0dba3 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Thu, 16 Jan 2014 07:29:52 +0100 Subject: [*] updat Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index aec2ac0..8405e3a 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ RESOURCES = $(GLYPHS) $(CHARS) $(STATUS) GRAPHED = $(DOTPDF) MAN = $(MANPAGE) COMPILED = $(DOC) -UNPACKED = luaotfload.sty luaotfload.lua +UNPACKED = luaotfload.sty GENERATED = $(GRAPHED) $(UNPACKED) $(COMPILED) $(RESOURCES) $(MAN) SOURCE = $(DTX) $(MANSOURCE) $(OTFL) README Makefile NEWS $(RESOURCESCRIPTS) -- cgit v1.2.3 From 708c689312e75953db431f8838846996ff447789 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Mon, 10 Feb 2014 07:14:53 +0100 Subject: [doc] add Makefile for doc subtree --- Makefile | 93 +++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 45 insertions(+), 48 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8405e3a..3ee6dc5 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ # Makefile for luaotfload NAME = luaotfload -DOC = $(NAME).pdf -DTX = $(NAME).dtx -OTFL = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf +LUAOTFLOAD = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf GLYPHSCRIPT = mkglyphlist GLYPHSOURCE = glyphlist.txt @@ -14,36 +12,36 @@ RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(STATUSSCRIPT) SCRIPTNAME = luaotfload-tool SCRIPT = $(SCRIPTNAME).lua -MANSOURCE = $(SCRIPTNAME).rst -MANPAGE = $(SCRIPTNAME).1 -OLDSCRIPT = luaotfload-legacy-tool.lua -GRAPH = filegraph -DOTPDF = $(GRAPH).pdf -DOT = $(GRAPH).dot +DOCSRCDIR = ./doc +GRAPH = filegraph +DOCSRC = $(DOCSRCDIR)/$(NAME).dtx +GRAPHSRC = $(DOCSRCDIR)/$(GRAPH).doc +MANSRC = $(DOCSRCDIR)/$(SCRIPTNAME).rst + +DOCPDF = $(DOCSRCDIR)/$(NAME).pdf +DOTPDF = $(DOCSRCDIR)/$(GRAPH).pdf +MANPAGE = $(DOCSRCDIR)/$(SCRIPTNAME).1 + +DOCS = $(DOCPDF) $(DOTPDF) $(MANPAGE) # Files grouped by generation mode GLYPHS = luaotfload-glyphlist.lua CHARS = luaotfload-characters.lua STATUS = luaotfload-status.lua RESOURCES = $(GLYPHS) $(CHARS) $(STATUS) -GRAPHED = $(DOTPDF) -MAN = $(MANPAGE) -COMPILED = $(DOC) -UNPACKED = luaotfload.sty -GENERATED = $(GRAPHED) $(UNPACKED) $(COMPILED) $(RESOURCES) $(MAN) -SOURCE = $(DTX) $(MANSOURCE) $(OTFL) README Makefile NEWS $(RESOURCESCRIPTS) +SOURCE = $(DOCSRC) $(MANSRC) $(LUAOTFLOAD) README Makefile NEWS $(RESOURCESCRIPTS) # Files grouped by installation location SCRIPTSTATUS = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS) -RUNSTATUS = $(UNPACKED) $(filter-out $(SCRIPTSTATUS),$(OTFL)) -DOCSTATUS = $(DOC) $(DOTPDF) README NEWS -MANSTATUS = $(MANPAGE) -SRCSTATUS = $(DTX) Makefile +RUNSTATUS = $(UNPACKED) $(filter-out $(SCRIPTSTATUS),$(LUAOTFLOAD)) +DOCSTATUS = $(DOCPDF) $(DOTPDF) README NEWS +MANSTATUS = $(MANPAGE) +SRCSTATUS = $(DOCSRC) $(MANSRC) $(GRAPHSRC) Makefile # The following definitions should be equivalent # ALL_STATUS = $(RUNSTATUS) $(DOCSTATUS) $(SRCSTATUS) -ALL_STATUS = $(GENERATED) $(SOURCE) +ALL_STATUS = $(RESOURCES) $(SOURCE) # Installation locations FORMAT = luatex @@ -63,20 +61,11 @@ ZIPS = $(CTAN_ZIP) $(TDS_ZIP) LUA = texlua -DO_TEX = luatex --interaction=batchmode $< >/dev/null -DO_LATEXMK = latexmk -e '$$max_repeat = 5' -pdf -lualatex -silent $< >/dev/null -# latexmk does only one run on my machine, so we’re not going to rely on it -DO_LATEX = lualatex -interaction=batchmode $< >/dev/null -DO_GRAPHVIZ = dot -Tpdf -o $@ $< > /dev/null DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null -DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null +DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null -DO_DOCUTILS = rst2man $< >$@ 2>/dev/null all: $(GENERATED) -graph: $(GRAPHED) -doc: $(GRAPHED) $(COMPILED) $(MAN) -manual: $(MAN) unpack: $(UNPACKED) resources: $(RESOURCES) chars: $(CHARS) @@ -85,6 +74,20 @@ ctan: $(CTAN_ZIP) tds: $(TDS_ZIP) world: all ctan +graph: $(DOTPDF) +doc: $(DOCS) +pdf: $(DOCPDF) +manual: $(MANPAGE) + +$(DOTPDF): + @make -C $(DOCSRCDIR) graph + +$(DOCPDF): + @make -C $(DOCSRCDIR) doc + +$(MANPAGE): + @make -C $(DOCSRCDIR) manual + $(GLYPHS): /dev/null $(DO_GLYPHS) @@ -94,19 +97,6 @@ $(CHARS): /dev/null $(STATUS): /dev/null $(DO_STATUS) -$(GRAPHED): $(DOT) - $(DO_GRAPHVIZ) - -$(COMPILED): $(DTX) - $(DO_LATEX) - $(DO_LATEX) - -$(UNPACKED): $(DTX) - $(DO_TEX) - -$(MAN): $(MANSOURCE) - $(DO_DOCUTILS) - define make-ctandir @$(RM) -rf $(DISTDIR) @mkdir -p $(DISTDIR) && cp $(SOURCE) $(COMPILED) $(DISTDIR) @@ -118,18 +108,22 @@ $(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP) $(make-ctandir) @zip -r -9 $@ $(TDS_ZIP) $(DISTDIR) >/dev/null -define run-install -@mkdir -p $(SCRIPTDIR) && cp $(SCRIPTSTATUS) $(SCRIPTDIR) -@mkdir -p $(RUNDIR) && cp $(RUNSTATUS) $(RUNDIR) +define run-install-doc @mkdir -p $(DOCDIR) && cp $(DOCSTATUS) $(DOCDIR) @mkdir -p $(SRCDIR) && cp $(SRCSTATUS) $(SRCDIR) @mkdir -p $(MANDIR) && cp $(MANSTATUS) $(MANDIR) endef +define run-install +@mkdir -p $(SCRIPTDIR) && cp $(SCRIPTSTATUS) $(SCRIPTDIR) +@mkdir -p $(RUNDIR) && cp $(RUNSTATUS) $(RUNDIR) +endef + $(TDS_ZIP): TEXMFROOT=./tmp-texmf $(TDS_ZIP): $(ALL_STATUS) @echo "Making TDS-ready archive $@." @$(RM) -- $@ + $(run-install-docs) $(run-install) @cd $(TEXMFROOT) && zip -9 ../$@ -r . >/dev/null @$(RM) -r -- $(TEXMFROOT) @@ -138,19 +132,22 @@ $(TDS_ZIP): $(ALL_STATUS) install: $(ALL_STATUS) @echo "Installing in '$(TEXMFROOT)'." + $(run-install-docs) $(run-install) -manifest: +manifest: @echo "Source files:" @for f in $(SOURCE); do echo $$f; done @echo "" @echo "Derived files:" @for f in $(GENERATED); do echo $$f; done -clean: +clean: + make -C $(DOCSRCDIR) $@ @$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out mrproper: clean + make -C $(DOCSRCDIR) $@ @$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE) @$(RM) -r -- $(DISTDIR) -- cgit v1.2.3 From 06e79fac8810293b5f3e9d03a1c0f838aefb4784 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Mon, 10 Feb 2014 08:00:50 +0100 Subject: [doc,*] fix TDS install rules in Makefile --- Makefile | 97 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 49 insertions(+), 48 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3ee6dc5..97a733a 100644 --- a/Makefile +++ b/Makefile @@ -1,43 +1,43 @@ # Makefile for luaotfload -NAME = luaotfload -LUAOTFLOAD = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf +NAME = luaotfload +LUAOTFLOAD = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf -GLYPHSCRIPT = mkglyphlist -GLYPHSOURCE = glyphlist.txt -CHARSCRIPT = mkcharacters -STATUSSCRIPT = mkstatus +GLYPHSCRIPT = mkglyphlist +GLYPHSOURCE = glyphlist.txt +CHARSCRIPT = mkcharacters +STATUSSCRIPT = mkstatus RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(STATUSSCRIPT) -SCRIPTNAME = luaotfload-tool -SCRIPT = $(SCRIPTNAME).lua +SCRIPTNAME = luaotfload-tool +SCRIPT = $(SCRIPTNAME).lua -DOCSRCDIR = ./doc -GRAPH = filegraph -DOCSRC = $(DOCSRCDIR)/$(NAME).dtx -GRAPHSRC = $(DOCSRCDIR)/$(GRAPH).doc -MANSRC = $(DOCSRCDIR)/$(SCRIPTNAME).rst +DOCSRCDIR = ./doc +GRAPH = filegraph +DOCSRC = $(DOCSRCDIR)/$(NAME).dtx +GRAPHSRC = $(DOCSRCDIR)/$(GRAPH).dot +MANSRC = $(DOCSRCDIR)/$(SCRIPTNAME).rst -DOCPDF = $(DOCSRCDIR)/$(NAME).pdf -DOTPDF = $(DOCSRCDIR)/$(GRAPH).pdf -MANPAGE = $(DOCSRCDIR)/$(SCRIPTNAME).1 +DOCPDF = $(DOCSRCDIR)/$(NAME).pdf +DOTPDF = $(DOCSRCDIR)/$(GRAPH).pdf +MANPAGE = $(DOCSRCDIR)/$(SCRIPTNAME).1 -DOCS = $(DOCPDF) $(DOTPDF) $(MANPAGE) +DOCS = $(DOCPDF) $(DOTPDF) $(MANPAGE) # Files grouped by generation mode -GLYPHS = luaotfload-glyphlist.lua -CHARS = luaotfload-characters.lua -STATUS = luaotfload-status.lua +GLYPHS = luaotfload-glyphlist.lua +CHARS = luaotfload-characters.lua +STATUS = luaotfload-status.lua RESOURCES = $(GLYPHS) $(CHARS) $(STATUS) -SOURCE = $(DOCSRC) $(MANSRC) $(LUAOTFLOAD) README Makefile NEWS $(RESOURCESCRIPTS) +SOURCE = $(DOCSRC) $(MANSRC) $(LUAOTFLOAD) README Makefile NEWS $(RESOURCESCRIPTS) # Files grouped by installation location -SCRIPTSTATUS = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS) -RUNSTATUS = $(UNPACKED) $(filter-out $(SCRIPTSTATUS),$(LUAOTFLOAD)) -DOCSTATUS = $(DOCPDF) $(DOTPDF) README NEWS -MANSTATUS = $(MANPAGE) -SRCSTATUS = $(DOCSRC) $(MANSRC) $(GRAPHSRC) Makefile +SCRIPTSTATUS = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS) +RUNSTATUS = $(UNPACKED) $(filter-out $(SCRIPTSTATUS),$(LUAOTFLOAD)) +DOCSTATUS = $(DOCPDF) $(DOTPDF) README NEWS +MANSTATUS = $(MANPAGE) +SRCSTATUS = $(DOCSRC) $(MANSRC) $(GRAPHSRC) Makefile # The following definitions should be equivalent # ALL_STATUS = $(RUNSTATUS) $(DOCSTATUS) $(SRCSTATUS) @@ -45,25 +45,25 @@ ALL_STATUS = $(RESOURCES) $(SOURCE) # Installation locations FORMAT = luatex -SCRIPTDIR = $(TEXMFROOT)/scripts/$(NAME) -RUNDIR = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME) -DOCDIR = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME) -MANDIR = $(TEXMFROOT)/doc/man/man1/ -SRCDIR = $(TEXMFROOT)/source/$(FORMAT)/$(NAME) -TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME) +SCRIPTDIR = $(TEXMFROOT)/scripts/$(NAME) +RUNDIR = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME) +DOCDIR = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME) +MANDIR = $(TEXMFROOT)/doc/man/man1/ +SRCDIR = $(TEXMFROOT)/source/$(FORMAT)/$(NAME) +TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME) # CTAN-friendly subdirectory for packaging -DISTDIR = ./luaotfload +DISTDIR = ./$(NAME) -CTAN_ZIP = $(NAME).zip -TDS_ZIP = $(NAME).tds.zip -ZIPS = $(CTAN_ZIP) $(TDS_ZIP) +CTAN_ZIP = $(NAME).zip +TDS_ZIP = $(NAME).tds.zip +ZIPS = $(CTAN_ZIP) $(TDS_ZIP) -LUA = texlua +LUA = texlua -DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null -DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null -DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null +DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null +DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null +DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null all: $(GENERATED) unpack: $(UNPACKED) @@ -102,28 +102,28 @@ define make-ctandir @mkdir -p $(DISTDIR) && cp $(SOURCE) $(COMPILED) $(DISTDIR) endef -$(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP) +$(CTAN_ZIP): $(DOCS) $(SOURCE) $(COMPILED) $(TDS_ZIP) @echo "Making $@ for CTAN upload." @$(RM) -- $@ $(make-ctandir) @zip -r -9 $@ $(TDS_ZIP) $(DISTDIR) >/dev/null define run-install-doc -@mkdir -p $(DOCDIR) && cp $(DOCSTATUS) $(DOCDIR) -@mkdir -p $(SRCDIR) && cp $(SRCSTATUS) $(SRCDIR) -@mkdir -p $(MANDIR) && cp $(MANSTATUS) $(MANDIR) +@mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(DOCDIR) +@mkdir -p $(SRCDIR) && cp -- $(SRCSTATUS) $(SRCDIR) +@mkdir -p $(MANDIR) && cp -- $(MANSTATUS) $(MANDIR) endef define run-install -@mkdir -p $(SCRIPTDIR) && cp $(SCRIPTSTATUS) $(SCRIPTDIR) -@mkdir -p $(RUNDIR) && cp $(RUNSTATUS) $(RUNDIR) +@mkdir -p $(SCRIPTDIR) && cp -- $(SCRIPTSTATUS) $(SCRIPTDIR) +@mkdir -p $(RUNDIR) && cp -- $(RUNSTATUS) $(RUNDIR) endef $(TDS_ZIP): TEXMFROOT=./tmp-texmf -$(TDS_ZIP): $(ALL_STATUS) +$(TDS_ZIP): $(DOCS) $(ALL_STATUS) @echo "Making TDS-ready archive $@." @$(RM) -- $@ - $(run-install-docs) + $(run-install-doc) $(run-install) @cd $(TEXMFROOT) && zip -9 ../$@ -r . >/dev/null @$(RM) -r -- $(TEXMFROOT) @@ -151,3 +151,4 @@ mrproper: clean @$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE) @$(RM) -r -- $(DISTDIR) +# vim:set noexpandtab:tabstop=8:shiftwidth=2 -- cgit v1.2.3 From 728f8e0b66b127ceef9aa537939e64e721499aad Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Mon, 10 Feb 2014 08:24:08 +0100 Subject: =?UTF-8?q?[*]=20don=E2=80=99t=20hardcode=20name=20of=20gmake=20ex?= =?UTF-8?q?ecutable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 97a733a..3ed893c 100644 --- a/Makefile +++ b/Makefile @@ -80,13 +80,13 @@ pdf: $(DOCPDF) manual: $(MANPAGE) $(DOTPDF): - @make -C $(DOCSRCDIR) graph + @$(MAKE) -C $(DOCSRCDIR) graph $(DOCPDF): - @make -C $(DOCSRCDIR) doc + @$(MAKE) -C $(DOCSRCDIR) doc $(MANPAGE): - @make -C $(DOCSRCDIR) manual + @$(MAKE) -C $(DOCSRCDIR) manual $(GLYPHS): /dev/null $(DO_GLYPHS) @@ -143,11 +143,11 @@ manifest: @for f in $(GENERATED); do echo $$f; done clean: - make -C $(DOCSRCDIR) $@ + $(MAKE) -C $(DOCSRCDIR) $@ @$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out mrproper: clean - make -C $(DOCSRCDIR) $@ + $(MAKE) -C $(DOCSRCDIR) $@ @$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE) @$(RM) -r -- $(DISTDIR) -- cgit v1.2.3 From 67932f829fbf7aaa269725e646d1c35f74d97be5 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Tue, 11 Feb 2014 07:29:32 +0100 Subject: [*] adapt Makefile to ./scripts and ./build --- Makefile | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3ed893c..689d9da 100644 --- a/Makefile +++ b/Makefile @@ -3,17 +3,21 @@ NAME = luaotfload LUAOTFLOAD = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf -GLYPHSCRIPT = mkglyphlist -GLYPHSOURCE = glyphlist.txt -CHARSCRIPT = mkcharacters -STATUSSCRIPT = mkstatus +DOCSRCDIR = ./doc +SCRIPTSRCDIR = ./scripts +BUILDDIR = ./build + +GLYPHSCRIPT = $(SCRIPTSRCDIR)/mkglyphlist +CHARSCRIPT = $(SCRIPTSRCDIR)/mkcharacters +STATUSSCRIPT = $(SCRIPTSRCDIR)/mkstatus + +GLYPHSOURCE = $(BUILDDIR)/glyphlist.txt RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(STATUSSCRIPT) SCRIPTNAME = luaotfload-tool SCRIPT = $(SCRIPTNAME).lua -DOCSRCDIR = ./doc GRAPH = filegraph DOCSRC = $(DOCSRCDIR)/$(NAME).dtx GRAPHSRC = $(DOCSRCDIR)/$(GRAPH).dot @@ -26,15 +30,15 @@ MANPAGE = $(DOCSRCDIR)/$(SCRIPTNAME).1 DOCS = $(DOCPDF) $(DOTPDF) $(MANPAGE) # Files grouped by generation mode -GLYPHS = luaotfload-glyphlist.lua -CHARS = luaotfload-characters.lua -STATUS = luaotfload-status.lua +GLYPHS = $(BUILDDIR)/$(NAME)-glyphlist.lua +CHARS = $(BUILDDIR)/$(NAME)-characters.lua +STATUS = $(BUILDDIR)/$(NAME)-status.lua RESOURCES = $(GLYPHS) $(CHARS) $(STATUS) SOURCE = $(DOCSRC) $(MANSRC) $(LUAOTFLOAD) README Makefile NEWS $(RESOURCESCRIPTS) # Files grouped by installation location SCRIPTSTATUS = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS) -RUNSTATUS = $(UNPACKED) $(filter-out $(SCRIPTSTATUS),$(LUAOTFLOAD)) +RUNSTATUS = $(filter-out $(SCRIPTSTATUS),$(LUAOTFLOAD)) DOCSTATUS = $(DOCPDF) $(DOTPDF) README NEWS MANSTATUS = $(MANPAGE) SRCSTATUS = $(DOCSRC) $(MANSRC) $(GRAPHSRC) Makefile @@ -61,15 +65,18 @@ ZIPS = $(CTAN_ZIP) $(TDS_ZIP) LUA = texlua +## For now the $(BUILDDIR) is hardcoded in the scripts +## but we might just as well pass it to them by as environment +## variables. DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null all: $(GENERATED) -unpack: $(UNPACKED) -resources: $(RESOURCES) -chars: $(CHARS) -status: $(STATUS) +builddir: $(BUILDDIR) +resources: builddir $(RESOURCES) +chars: builddir $(CHARS) +status: builddir $(STATUS) ctan: $(CTAN_ZIP) tds: $(TDS_ZIP) world: all ctan @@ -97,6 +104,9 @@ $(CHARS): /dev/null $(STATUS): /dev/null $(DO_STATUS) +$(BUILDDIR): /dev/null + mkdir -p $(BUILDDIR) + define make-ctandir @$(RM) -rf $(DISTDIR) @mkdir -p $(DISTDIR) && cp $(SOURCE) $(COMPILED) $(DISTDIR) @@ -142,13 +152,17 @@ manifest: @echo "Derived files:" @for f in $(GENERATED); do echo $$f; done +CLEANEXTS = log aux toc idx ind ilg out +CLEANME = $(foreach ext,$(CLEANEXTS),$(wildcard *.$(ext))) +CLEANME += $(foreach ext,$(CLEANEXTS),$(wildcard $(BUILDDIR)/*$(ext))) + clean: $(MAKE) -C $(DOCSRCDIR) $@ - @$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out + @$(RM) -- $(CLEANME) mrproper: clean $(MAKE) -C $(DOCSRCDIR) $@ @$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE) - @$(RM) -r -- $(DISTDIR) + @$(RM) -r -- $(DISTDIR) $(BUILDDIR) # vim:set noexpandtab:tabstop=8:shiftwidth=2 -- cgit v1.2.3 From f1dfd5b05f12b23479796d45dde36180f1dd01f4 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Fri, 14 Feb 2014 07:02:01 +0100 Subject: [*] adapt Makefile to new dir structure --- Makefile | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 689d9da..aa5e580 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,15 @@ # Makefile for luaotfload NAME = luaotfload -LUAOTFLOAD = $(wildcard luaotfload-*.lua) luaotfload-blacklist.cnf DOCSRCDIR = ./doc SCRIPTSRCDIR = ./scripts +SRCSRCDIR = ./src BUILDDIR = ./build +MISCDIR = ./misc + +SRC = $(wildcard $(SRCSRCDIR)/luaotfload-*.lua) +SRC = $(MISCDIR)/luaotfload-blacklist.cnf GLYPHSCRIPT = $(SCRIPTSRCDIR)/mkglyphlist CHARSCRIPT = $(SCRIPTSRCDIR)/mkcharacters @@ -15,17 +19,17 @@ GLYPHSOURCE = $(BUILDDIR)/glyphlist.txt RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(STATUSSCRIPT) -SCRIPTNAME = luaotfload-tool -SCRIPT = $(SCRIPTNAME).lua +TOOLNAME = luaotfload-tool +TOOL = $(SRCSRCDIR)/$(TOOLNAME).lua GRAPH = filegraph DOCSRC = $(DOCSRCDIR)/$(NAME).dtx GRAPHSRC = $(DOCSRCDIR)/$(GRAPH).dot -MANSRC = $(DOCSRCDIR)/$(SCRIPTNAME).rst +MANSRC = $(DOCSRCDIR)/$(TOOLNAME).rst DOCPDF = $(DOCSRCDIR)/$(NAME).pdf DOTPDF = $(DOCSRCDIR)/$(GRAPH).pdf -MANPAGE = $(DOCSRCDIR)/$(SCRIPTNAME).1 +MANPAGE = $(DOCSRCDIR)/$(TOOLNAME).1 DOCS = $(DOCPDF) $(DOTPDF) $(MANPAGE) @@ -34,21 +38,21 @@ GLYPHS = $(BUILDDIR)/$(NAME)-glyphlist.lua CHARS = $(BUILDDIR)/$(NAME)-characters.lua STATUS = $(BUILDDIR)/$(NAME)-status.lua RESOURCES = $(GLYPHS) $(CHARS) $(STATUS) -SOURCE = $(DOCSRC) $(MANSRC) $(LUAOTFLOAD) README Makefile NEWS $(RESOURCESCRIPTS) +SOURCE = $(DOCSRC) $(MANSRC) $(SRC) README Makefile NEWS $(RESOURCESCRIPTS) # Files grouped by installation location -SCRIPTSTATUS = $(SCRIPT) $(OLDSCRIPT) $(RESOURCESCRIPTS) -RUNSTATUS = $(filter-out $(SCRIPTSTATUS),$(LUAOTFLOAD)) +SCRIPTSTATUS = $(TOOL) $(RESOURCESCRIPTS) +RUNSTATUS = $(filter-out $(SCRIPTSTATUS),$(SRC)) DOCSTATUS = $(DOCPDF) $(DOTPDF) README NEWS MANSTATUS = $(MANPAGE) SRCSTATUS = $(DOCSRC) $(MANSRC) $(GRAPHSRC) Makefile # The following definitions should be equivalent # ALL_STATUS = $(RUNSTATUS) $(DOCSTATUS) $(SRCSTATUS) -ALL_STATUS = $(RESOURCES) $(SOURCE) +ALL_STATUS = $(RESOURCES) $(SOURCE) # Installation locations -FORMAT = luatex +FORMAT = luatex SCRIPTDIR = $(TEXMFROOT)/scripts/$(NAME) RUNDIR = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME) DOCDIR = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME) @@ -57,10 +61,10 @@ SRCDIR = $(TEXMFROOT)/source/$(FORMAT)/$(NAME) TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME) # CTAN-friendly subdirectory for packaging -DISTDIR = ./$(NAME) +DISTDIR = $(BUILDDIR)/$(NAME) -CTAN_ZIP = $(NAME).zip -TDS_ZIP = $(NAME).tds.zip +CTAN_ZIP = $(BUILDDIR)/$(NAME).zip +TDS_ZIP = $(BUILDDIR)/$(NAME).tds.zip ZIPS = $(CTAN_ZIP) $(TDS_ZIP) LUA = texlua @@ -74,9 +78,9 @@ DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null all: $(GENERATED) builddir: $(BUILDDIR) -resources: builddir $(RESOURCES) -chars: builddir $(CHARS) -status: builddir $(STATUS) +resources: $(RESOURCES) +chars: $(CHARS) +status: $(STATUS) ctan: $(CTAN_ZIP) tds: $(TDS_ZIP) world: all ctan @@ -95,13 +99,13 @@ $(DOCPDF): $(MANPAGE): @$(MAKE) -C $(DOCSRCDIR) manual -$(GLYPHS): /dev/null +$(GLYPHS): builddir $(DO_GLYPHS) -$(CHARS): /dev/null +$(CHARS): builddir $(DO_CHARS) -$(STATUS): /dev/null +$(STATUS): builddir $(DO_STATUS) $(BUILDDIR): /dev/null @@ -126,7 +130,7 @@ endef define run-install @mkdir -p $(SCRIPTDIR) && cp -- $(SCRIPTSTATUS) $(SCRIPTDIR) -@mkdir -p $(RUNDIR) && cp -- $(RUNSTATUS) $(RUNDIR) +@mkdir -p $(RUNDIR) && cp -- $(RUNSTATUS) $(RUNDIR) endef $(TDS_ZIP): TEXMFROOT=./tmp-texmf @@ -163,6 +167,6 @@ clean: mrproper: clean $(MAKE) -C $(DOCSRCDIR) $@ @$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE) - @$(RM) -r -- $(DISTDIR) $(BUILDDIR) + @$(RM) -r -- $(BUILDDIR) -# vim:set noexpandtab:tabstop=8:shiftwidth=2 +# vim:noexpandtab:tabstop=8:shiftwidth=2 -- cgit v1.2.3 From 6184dd4e08a8af39f02ab6bc44f3b56835d5c390 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Fri, 14 Feb 2014 07:20:30 +0100 Subject: [build] fix Makefile rules for TDS zip --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index aa5e580..1fbc378 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,8 @@ BUILDDIR = ./build MISCDIR = ./misc SRC = $(wildcard $(SRCSRCDIR)/luaotfload-*.lua) -SRC = $(MISCDIR)/luaotfload-blacklist.cnf +SRC += $(SRCSRCDIR)/luaotfload.sty +SRC += $(MISCDIR)/luaotfload-blacklist.cnf GLYPHSCRIPT = $(SCRIPTSRCDIR)/mkglyphlist CHARSCRIPT = $(SCRIPTSRCDIR)/mkcharacters @@ -130,7 +131,7 @@ endef define run-install @mkdir -p $(SCRIPTDIR) && cp -- $(SCRIPTSTATUS) $(SCRIPTDIR) -@mkdir -p $(RUNDIR) && cp -- $(RUNSTATUS) $(RUNDIR) +@mkdir -p $(RUNDIR) && cp -- $(RESOURCES) $(RUNSTATUS) $(RUNDIR) endef $(TDS_ZIP): TEXMFROOT=./tmp-texmf -- cgit v1.2.3 From 87aace07b0302f7124db092221483b5fce5b7755 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Fri, 14 Feb 2014 08:15:09 +0100 Subject: [build] describe targets in Makefile (new top target: show) --- Makefile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1fbc378..26de3bc 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,8 @@ DO_GLYPHS = $(LUA) $(GLYPHSCRIPT) > /dev/null DO_CHARS = $(LUA) $(CHARSCRIPT) > /dev/null DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null +show: showtargets + all: $(GENERATED) builddir: $(BUILDDIR) resources: $(RESOURCES) @@ -170,4 +172,24 @@ mrproper: clean @$(RM) -- $(GENERATED) $(ZIPS) $(GLYPHSOURCE) @$(RM) -r -- $(BUILDDIR) +############################################################################### +showtargets: + @echo "Available targets:" + @echo + @echo " all build everything: documentation, resources," + @echo " world build everything and package zipballs" + @echo " doc compile PDF documentation" + @echo " resources generate resource files (chars, glyphs)" + @echo + @echo " pdf build luaotfload.pdf" + @echo " manual crate manpage for luaotfload-tool (requires Docutils)" + @echo " graph generate file graph (requires GraphViz)" + @echo + @echo " chars import char-def.lua as luaotfload-characters.lua" + @echo " status create repository info (luaotfload-status.lua)" + @echo + @echo " tds package a zipball according to the TDS" + @echo " ctan package a zipball for uploading to CTAN" + @echo + # vim:noexpandtab:tabstop=8:shiftwidth=2 -- cgit v1.2.3 From aafd73e8a91f986f011338301adac09f046b745f Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Fri, 14 Feb 2014 19:17:28 +0100 Subject: [build] declare show and showtargets .PHONY targets --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 26de3bc..d00b237 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ $(TDS_ZIP): $(DOCS) $(ALL_STATUS) @cd $(TEXMFROOT) && zip -9 ../$@ -r . >/dev/null @$(RM) -r -- $(TEXMFROOT) -.PHONY: install manifest clean mrproper +.PHONY: install manifest clean mrproper show showtargets install: $(ALL_STATUS) @echo "Installing in '$(TEXMFROOT)'." -- cgit v1.2.3 From bf21af737122e0c904f305b3213b91710bb93216 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Sat, 15 Feb 2014 15:51:10 +0100 Subject: [doc,*] adapt makefiles to new doc source --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d00b237..a4b3fe7 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ TOOLNAME = luaotfload-tool TOOL = $(SRCSRCDIR)/$(TOOLNAME).lua GRAPH = filegraph -DOCSRC = $(DOCSRCDIR)/$(NAME).dtx +DOCSRC = $(addprefix $(DOCSRCDIR)/$(NAME), -main.tex -latex.tex) GRAPHSRC = $(DOCSRCDIR)/$(GRAPH).dot MANSRC = $(DOCSRCDIR)/$(TOOLNAME).rst -- cgit v1.2.3 From f3b498a2b1d5dcb4dec2c01d757616fd968e1ee0 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Mon, 17 Feb 2014 23:02:01 +0100 Subject: [misc,build] package suppressionfile in doc/ tree --- Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a4b3fe7..8b6bff2 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,8 @@ SRC = $(wildcard $(SRCSRCDIR)/luaotfload-*.lua) SRC += $(SRCSRCDIR)/luaotfload.sty SRC += $(MISCDIR)/luaotfload-blacklist.cnf +VGND = $(MISCDIR)/valgrind-kpse-suppression.sup + GLYPHSCRIPT = $(SCRIPTSRCDIR)/mkglyphlist CHARSCRIPT = $(SCRIPTSRCDIR)/mkcharacters STATUSSCRIPT = $(SCRIPTSRCDIR)/mkstatus @@ -64,8 +66,10 @@ TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME) # CTAN-friendly subdirectory for packaging DISTDIR = $(BUILDDIR)/$(NAME) -CTAN_ZIP = $(BUILDDIR)/$(NAME).zip -TDS_ZIP = $(BUILDDIR)/$(NAME).tds.zip +CTAN_ZIPFILE = $(NAME).zip +TDS_ZIPFILE = $(NAME).tds.zip +CTAN_ZIP = $(BUILDDIR)/$(CTAN_ZIPFILE) +TDS_ZIP = $(BUILDDIR)/$(TDS_ZIPFILE) ZIPS = $(CTAN_ZIP) $(TDS_ZIP) LUA = texlua @@ -116,17 +120,17 @@ $(BUILDDIR): /dev/null define make-ctandir @$(RM) -rf $(DISTDIR) -@mkdir -p $(DISTDIR) && cp $(SOURCE) $(COMPILED) $(DISTDIR) +@mkdir -p $(DISTDIR) && cp $(VGND) $(SOURCE) $(COMPILED) $(DISTDIR) endef $(CTAN_ZIP): $(DOCS) $(SOURCE) $(COMPILED) $(TDS_ZIP) @echo "Making $@ for CTAN upload." @$(RM) -- $@ $(make-ctandir) - @zip -r -9 $@ $(TDS_ZIP) $(DISTDIR) >/dev/null + cd $(BUILDDIR) && zip -r -9 $(CTAN_ZIPFILE) $(TDS_ZIPFILE) $(NAME) >/dev/null define run-install-doc -@mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(DOCDIR) +@mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(DOCDIR) @mkdir -p $(SRCDIR) && cp -- $(SRCSTATUS) $(SRCDIR) @mkdir -p $(MANDIR) && cp -- $(MANSTATUS) $(MANDIR) endef -- cgit v1.2.3 From 31652228ee93553b05bfbaa48b9bec6cf247a401 Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Fri, 7 Mar 2014 07:55:42 +0100 Subject: [*] handle license file in makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8b6bff2..2dc68bd 100644 --- a/Makefile +++ b/Makefile @@ -41,12 +41,12 @@ GLYPHS = $(BUILDDIR)/$(NAME)-glyphlist.lua CHARS = $(BUILDDIR)/$(NAME)-characters.lua STATUS = $(BUILDDIR)/$(NAME)-status.lua RESOURCES = $(GLYPHS) $(CHARS) $(STATUS) -SOURCE = $(DOCSRC) $(MANSRC) $(SRC) README Makefile NEWS $(RESOURCESCRIPTS) +SOURCE = $(DOCSRC) $(MANSRC) $(SRC) README COPYING Makefile NEWS $(RESOURCESCRIPTS) # Files grouped by installation location SCRIPTSTATUS = $(TOOL) $(RESOURCESCRIPTS) RUNSTATUS = $(filter-out $(SCRIPTSTATUS),$(SRC)) -DOCSTATUS = $(DOCPDF) $(DOTPDF) README NEWS +DOCSTATUS = $(DOCPDF) $(DOTPDF) README NEWS COPYING MANSTATUS = $(MANPAGE) SRCSTATUS = $(DOCSRC) $(MANSRC) $(GRAPHSRC) Makefile -- cgit v1.2.3 From fdea22314cb51cf514f6f1004f75b9d6bacafe2d Mon Sep 17 00:00:00 2001 From: Philipp Gesang <phg42.2a@gmail.com> Date: Mon, 9 Jun 2014 23:47:01 +0200 Subject: [*] add rules for building config man page to makefiles --- Makefile | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2dc68bd..fd3eefb 100644 --- a/Makefile +++ b/Makefile @@ -25,16 +25,20 @@ RESOURCESCRIPTS = $(GLYPHSCRIPT) $(CHARSCRIPT) $(STATUSSCRIPT) TOOLNAME = luaotfload-tool TOOL = $(SRCSRCDIR)/$(TOOLNAME).lua +CONFNAME = luaotfload.conf + GRAPH = filegraph DOCSRC = $(addprefix $(DOCSRCDIR)/$(NAME), -main.tex -latex.tex) GRAPHSRC = $(DOCSRCDIR)/$(GRAPH).dot -MANSRC = $(DOCSRCDIR)/$(TOOLNAME).rst +MANSRC = $(DOCSRCDIR)/$(TOOLNAME).rst $(DOCSRCDIR)/$(CONFNAME).rst DOCPDF = $(DOCSRCDIR)/$(NAME).pdf DOTPDF = $(DOCSRCDIR)/$(GRAPH).pdf -MANPAGE = $(DOCSRCDIR)/$(TOOLNAME).1 +TOOLMAN = $(DOCSRCDIR)/$(TOOLNAME).1 +CONFMAN = $(DOCSRCDIR)/$(CONFNAME).5 +MANPAGES = $(TOOLMAN) $(CONFMAN) -DOCS = $(DOCPDF) $(DOTPDF) $(MANPAGE) +DOCS = $(DOCPDF) $(DOTPDF) $(MANPAGES) # Files grouped by generation mode GLYPHS = $(BUILDDIR)/$(NAME)-glyphlist.lua @@ -47,7 +51,6 @@ SOURCE = $(DOCSRC) $(MANSRC) $(SRC) README COPYING Makefile NEWS $(RESOURCESCRI SCRIPTSTATUS = $(TOOL) $(RESOURCESCRIPTS) RUNSTATUS = $(filter-out $(SCRIPTSTATUS),$(SRC)) DOCSTATUS = $(DOCPDF) $(DOTPDF) README NEWS COPYING -MANSTATUS = $(MANPAGE) SRCSTATUS = $(DOCSRC) $(MANSRC) $(GRAPHSRC) Makefile # The following definitions should be equivalent @@ -59,7 +62,8 @@ FORMAT = luatex SCRIPTDIR = $(TEXMFROOT)/scripts/$(NAME) RUNDIR = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME) DOCDIR = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME) -MANDIR = $(TEXMFROOT)/doc/man/man1/ +MAN1DIR = $(TEXMFROOT)/doc/man/man1/ +MAN5DIR = $(TEXMFROOT)/doc/man/man5/ SRCDIR = $(TEXMFROOT)/source/$(FORMAT)/$(NAME) TEXMFROOT = $(shell kpsewhich --var-value TEXMFHOME) @@ -95,7 +99,7 @@ world: all ctan graph: $(DOTPDF) doc: $(DOCS) pdf: $(DOCPDF) -manual: $(MANPAGE) +manual: $(MANPAGES) $(DOTPDF): @$(MAKE) -C $(DOCSRCDIR) graph @@ -103,8 +107,8 @@ $(DOTPDF): $(DOCPDF): @$(MAKE) -C $(DOCSRCDIR) doc -$(MANPAGE): - @$(MAKE) -C $(DOCSRCDIR) manual +$(MANPAGES): + @$(MAKE) -C $(DOCSRCDIR) manuals $(GLYPHS): builddir $(DO_GLYPHS) @@ -132,7 +136,8 @@ $(CTAN_ZIP): $(DOCS) $(SOURCE) $(COMPILED) $(TDS_ZIP) define run-install-doc @mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(DOCDIR) @mkdir -p $(SRCDIR) && cp -- $(SRCSTATUS) $(SRCDIR) -@mkdir -p $(MANDIR) && cp -- $(MANSTATUS) $(MANDIR) +@mkdir -p $(MAN1DIR) && cp -- $(TOOLMAN) $(MAN1DIR) +@mkdir -p $(MAN5DIR) && cp -- $(CONFMAN) $(MAN5DIR) endef define run-install @@ -186,7 +191,8 @@ showtargets: @echo " resources generate resource files (chars, glyphs)" @echo @echo " pdf build luaotfload.pdf" - @echo " manual crate manpage for luaotfload-tool (requires Docutils)" + @echo " manual crate manpages for luaotfload-tool(1) and" + @echo " luaotfload.conf(5) (requires Docutils)" @echo " graph generate file graph (requires GraphViz)" @echo @echo " chars import char-def.lua as luaotfload-characters.lua" -- cgit v1.2.3