1 files changed, 11 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/luatex/luaotfload/Makefile b/Master/texmf-dist/source/luatex/luaotfload/Makefile
index 63d389bb1b4..6a1363073dc 100644
--- a/Master/texmf-dist/source/luatex/luaotfload/Makefile
+++ b/Master/texmf-dist/source/luatex/luaotfload/Makefile
@@ -9,12 +9,13 @@ OTFL = $(wildcard otfl-*.lua)
 COMPILED = $(DOC)
 UNPACKED = luaotfload.sty luaotfload.lua
 GENERATED = $(COMPILED) $(UNPACKED)
-SOURCE = $(DTX) $(OTFL) README Makefile News
+SOURCE = $(DTX) $(OTFL) README Makefile NEWS mkluatexfontdb.lua
 
 # Files grouped by installation location
-RUNFILES = $(UNPACKED) $(OTFL)
-DOCFILES = $(DOC) README News
-SRCFILES = $(DTX) Makefile
+SCRIPTFILES = mkluatexfontdb.lua
+RUNFILES    = $(UNPACKED) $(OTFL)
+DOCFILES    = $(DOC) README NEWS
+SRCFILES    = $(DTX) Makefile
 
 # The following definitions should be equivalent
 # ALL_FILES = $(RUNFILES) $(DOCFILES) $(SRCFILES)
@@ -22,9 +23,10 @@ ALL_FILES = $(GENERATED) $(SOURCE)
 
 # Installation locations
 FORMAT = luatex
-RUNDIR = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME)
-DOCDIR = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME)
-SRCDIR = $(TEXMFROOT)/source/$(FORMAT)/$(NAME)
+SCRIPTDIR = $(TEXMFROOT)/scripts/mkluatexfontdb
+RUNDIR    = $(TEXMFROOT)/tex/$(FORMAT)/$(NAME)
+DOCDIR    = $(TEXMFROOT)/doc/$(FORMAT)/$(NAME)
+SRCDIR    = $(TEXMFROOT)/source/$(FORMAT)/$(NAME)
 TEXMFROOT = ./texmf
 
 CTAN_ZIP = $(NAME).zip
@@ -57,6 +59,7 @@ $(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
 	@zip -9 $@ $^ >/dev/null
 
 define run-install
+@mkdir -p $(SCRIPTDIR) && cp $(SCRIPTFILES) $(SCRIPTDIR)
 @mkdir -p $(RUNDIR) && cp $(RUNFILES) $(RUNDIR)
 @mkdir -p $(DOCDIR) && cp $(DOCFILES) $(DOCDIR)
 @mkdir -p $(SRCDIR) && cp $(SRCFILES) $(SRCDIR)
@@ -84,7 +87,7 @@ manifest:
 	@for f in $(GENERATED); do echo $$f; done
 
 clean: 
-	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg
+	@$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out
 
 mrproper: clean
 	@$(RM) -- $(GENERATED) $(ZIPS)