[doc,*] fix TDS install rules in Makefile

1 files changed, 49 insertions, 48 deletions

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