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