From b4d0a66b368864a30ec7d025dff8b9cc17468d40 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Mon, 16 Mar 2015 20:09:06 +0100
Subject: fixed tar ball creation for out-of-tree configurations

 * Automake was trying to overwrite the submodule Scintilla
   (that should be distributed) with the local copy of Scintilla
   (perhaps because the directory had the same name).
   Instead, we now copy the submodule Scintilla manually into
   the distribution directory.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 52c0d17..b3061b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,8 @@ EXTRA_DIST += ico/sciteco-48.png \
 
 # Distribute entire scintilla directory and
 # do some manual cleanup
-EXTRA_DIST += scintilla
 dist-hook:
+	cp -r $(srcdir)/scintilla $(distdir)
 	rm -rf `find $(distdir)/scintilla -name *.o` \
 	       $(distdir)/scintilla/bin/scintilla.a
 	rm -rf `find $(distdir)/scintilla -name ".git*"` \
-- 
cgit v1.2.3