From e688377c64298840b627f3e05952d0aa24950842 Mon Sep 17 00:00:00 2001
From: Adam Retter <adam.retter@googlemail.com>
Date: Sat, 16 Feb 2019 19:02:37 +0100
Subject: [PATCH] [refactor] Fix source paths for dist and installer

---
 build/scripts/dist.xml     |  4 +++-
 installer/install.xml.tmpl | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/build/scripts/dist.xml b/build/scripts/dist.xml
index b4b6d0b7572..5ab90e86a0a 100644
--- a/build/scripts/dist.xml
+++ b/build/scripts/dist.xml
@@ -269,7 +269,9 @@
             <fileset dir="bin"/>
         </copy>
         <copy todir="${dist.dir}/src">
-            <fileset dir="src"/>
+            <fileset dir="${module.exist-core}/src"/>
+            <fileset dir="${module.exist-start}/src"/>
+            <fileset dir="${module.exist-testkit}/src"/>
         </copy>
         <copy todir="${dist.dir}/lib">
             <fileset dir="lib"/>
diff --git a/installer/install.xml.tmpl b/installer/install.xml.tmpl
index 271145356d2..fb7be08df6d 100644
--- a/installer/install.xml.tmpl
+++ b/installer/install.xml.tmpl
@@ -81,7 +81,19 @@
     <packs>
         <pack name="Sources" required="no" installGroups="Group1">
             <description>Java source files and build scripts. Install this package if you want to customize the build, create extensions or contribute to eXist-db.</description>
-            <fileset targetdir="$INSTALL_PATH/src" dir="src">
+            <fileset targetdir="$INSTALL_PATH/src/exist-core" dir="exist-core/src">
+                <exclude name="**/*~"/>
+                <exclude name="**/.*"/>
+                <exclude name="**/CVS/"/>
+                <exclude name=".*"/>
+            </fileset>
+            <fileset targetdir="$INSTALL_PATH/src/exist-start" dir="exist-start/src">
+                <exclude name="**/*~"/>
+                <exclude name="**/.*"/>
+                <exclude name="**/CVS/"/>
+                <exclude name=".*"/>
+            </fileset>
+            <fileset targetdir="$INSTALL_PATH/src/exist-testkit" dir="exist-testkit/src">
                 <exclude name="**/*~"/>
                 <exclude name="**/.*"/>
                 <exclude name="**/CVS/"/>