aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2015-03-16 20:09:06 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2015-03-16 20:09:06 +0100
commitb4d0a66b368864a30ec7d025dff8b9cc17468d40 (patch)
treed989f67cf7a0850bc504bb58701a26ab0d93856a
parent64ee41446def1605a71d49fce6461b8ff3f5c0d2 (diff)
downloadsciteco-b4d0a66b368864a30ec7d025dff8b9cc17468d40.tar.gz
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.
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
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*"` \