From cadee7a6670c42cddb0869f476327285aa5b219b Mon Sep 17 00:00:00 2001

From: Lars Uebernickel <lars@uebernic.de>

Date: Mon, 30 May 2016 17:45:27 +0200

Subject: Makefile.am: fix make dist from tarballs

When not inside a git checkout, `make dist` echos the directories to

include. Tar expects them to be newline-separated.

Fixes #4494

---

 Makefile.am | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am

index 9ec83da..d4cfab4 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -255,7 +255,7 @@ COMMITTED_DIST = \

 # Build up the distribution using $COMMITTED_DIST and include node_modules and bower licenses

 dist-hook: dist-doc-hook

-	( cd $(srcdir); git ls-tree HEAD --name-only -r $(COMMITTED_DIST) || echo $(COMMITTED_DIST) ) | \

+	( cd $(srcdir); git ls-tree HEAD --name-only -r $(COMMITTED_DIST) || (echo $(COMMITTED_DIST) | tr ' ' '\n' ) ) | \

 		tar -C $(srcdir) -cf - -T - | tar -C $(distdir) -xf -

 	tar -C $(srcdir) -cf - --exclude='phantomjs*' --exclude='jshint*' node_modules/ | tar -C $(distdir) -xf -

 	echo $(VERSION) > $(distdir)/.tarball

-- 

1.8.3.1