From 55aaa995395d670696df6542c5595b8187a7a1e9 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Sun, 13 Jul 2014 19:17:11 +0200
Subject: [build] remove obsolete targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The target ``all`` didn’t work for quite a long time and ``world`` was
more or less an alias for it. The ``ctan`` target does everything now,
with ``all`` as an alias.
---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index fd3eefb..5673cc7 100644
--- a/Makefile
+++ b/Makefile
@@ -87,14 +87,13 @@ DO_STATUS	= $(LUA) $(STATUSSCRIPT)  > /dev/null
 
 show: showtargets
 
-all: $(GENERATED)
+all: ctan
 builddir: $(BUILDDIR)
 resources: $(RESOURCES)
 chars: $(CHARS)
 status: $(STATUS)
 ctan: $(CTAN_ZIP)
 tds: $(TDS_ZIP)
-world: all ctan
 
 graph: $(DOTPDF)
 doc: $(DOCS)
@@ -185,8 +184,6 @@ mrproper: clean
 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
-- 
cgit v1.2.3


From cb67cb7aa5414186bb86d7a59a488028e19e2cf8 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Sun, 13 Jul 2014 19:29:34 +0200
Subject: [build] package example config

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5673cc7..4e21d0f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ SRC		+= $(SRCSRCDIR)/luaotfload.sty
 SRC		+= $(MISCDIR)/luaotfload-blacklist.cnf
 
 VGND		= $(MISCDIR)/valgrind-kpse-suppression.sup
+CONFDEMO	= $(MISCDIR)/luaotfload.conf.example
 
 GLYPHSCRIPT	= $(SCRIPTSRCDIR)/mkglyphlist
 CHARSCRIPT	= $(SCRIPTSRCDIR)/mkcharacters
@@ -123,7 +124,7 @@ $(BUILDDIR): /dev/null
 
 define make-ctandir
 @$(RM) -rf $(DISTDIR)
-@mkdir -p $(DISTDIR) && cp $(VGND) $(SOURCE) $(COMPILED) $(DISTDIR)
+@mkdir -p $(DISTDIR) && cp $(VGND) $(CONFDEMO) $(SOURCE) $(COMPILED) $(DISTDIR)
 endef
 
 $(CTAN_ZIP): $(DOCS) $(SOURCE) $(COMPILED) $(TDS_ZIP)
@@ -133,7 +134,7 @@ $(CTAN_ZIP): $(DOCS) $(SOURCE) $(COMPILED) $(TDS_ZIP)
 	cd $(BUILDDIR) && zip -r -9 $(CTAN_ZIPFILE) $(TDS_ZIPFILE) $(NAME) >/dev/null
 
 define run-install-doc
-@mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(DOCDIR)
+@mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(CONFDEMO) $(DOCDIR)
 @mkdir -p $(SRCDIR) && cp -- $(SRCSTATUS) $(SRCDIR)
 @mkdir -p $(MAN1DIR) && cp -- $(TOOLMAN) $(MAN1DIR)
 @mkdir -p $(MAN5DIR) && cp -- $(CONFMAN) $(MAN5DIR)
-- 
cgit v1.2.3