From ca1314ef7ab02f875ffc26be058df95691234faf Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sat, 12 Dec 2015 15:17:20 +0100
Subject: [mkimport,build] integrate with main makefile

---
 Makefile         | 6 ++----
 scripts/mkimport | 5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f23c6b8..a131f3a 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ GRAPH		= filegraph
 DOCSRC		= $(addprefix $(DOCSRCDIR)/$(NAME), -main.tex -latex.tex)
 LOADERSRC	= $(wildcard $(FONTLOADERSRCDIR)/*.lua)
 LOADERSRC	+= $(wildcard $(FONTLOADERSRCDIR)/*.tex)
-LOADERSRC	+= $(PACKAGEDIR)/luaotfload-package.lua
 GRAPHSRC	= $(DOCSRCDIR)/$(GRAPH).dot
 MANSRC		= $(DOCSRCDIR)/$(TOOLNAME).rst $(DOCSRCDIR)/$(CONFNAME).rst
 
@@ -99,8 +98,7 @@ DO_GLYPHS	= $(LUA) $(GLYPHSCRIPT) > /dev/null
 DO_CHARS	= $(LUA) $(CHARSCRIPT)  > /dev/null
 DO_STATUS	= $(LUA) $(STATUSSCRIPT) --fontloader=$(LOADER) >/dev/null
 DO_IMPORT	= $(LUA) $(IMPORTSCRIPT) import >/dev/null
-DO_PACKAGE	= $(LUA) $(IMPORTSCRIPT) package \
-		  $(PACKAGEDIR)/luaotfload-package.lua $(LOADER) >/dev/null
+DO_PACKAGE	= $(LUA) $(IMPORTSCRIPT) package $(LOADER) >/dev/null
 
 define check-lua-files
 @echo validating syntax
@@ -200,7 +198,7 @@ $(TDS_ZIP): $(DOCS) $(ALL_STATUS) check
 
 sign: $(CTAN_ZIPSIG)
 
-.PHONY: install manifest clean mrproper show showtargets check import news
+.PHONY: package install manifest clean mrproper show showtargets check import news
 
 install:
 	@echo "	××××××××××××××××××××××××××××××××"
diff --git a/scripts/mkimport b/scripts/mkimport
index e5fa723..b3c71fe 100755
--- a/scripts/mkimport
+++ b/scripts/mkimport
@@ -96,7 +96,6 @@ local prefixes = {
 
 --doc]]--
 
-local loader_merge_name  = "luaotfload-package.lua"
 local loader_target_name = "fontloader-%s.lua"
 local loader_orig_dir    = "/src/fontloader/"
 local loader_target_dir  = "/build/"
@@ -771,7 +770,6 @@ local build_paths = function (argv)
   local base_dir    = orig_dir .. loader_orig_dir
   local loader_name = stringformat (loader_target_name, os.date ("%F"))
   local target_name = orig_dir .. loader_target_dir .. loader_name
-  local merge_name  = base_dir .. loader_merge_name
 
   if #argv >= 2 then
     local fname = argv[2]
@@ -781,7 +779,7 @@ local build_paths = function (argv)
            argv[2])
     end
     base_dir    = dir
-    merge_name  = fname
+    target_name  = fname
   end
 
   if #argv == 3 then
@@ -899,7 +897,6 @@ local package = function (argv)
   --- check preconditions
 
   if not lfsisdir (paths.base_dir)          then die ("directory %s does not exist", emphasis (paths.base_dir   )) end
-  if not lfsisfile (paths.merge_name)       then die ("missing merge file at %s",    emphasis (paths.merge_name )) end
   if not fileiswritable (paths.target_name) then die ("cannot write to %s",          emphasis (paths.target_name)) end
 ---- not lfschdir (paths.base_dir)          then die ("failed to cd into %s",        emphasis (paths.base_dir   )) end
 
-- 
cgit v1.2.3