build: move source submodules to src subdir

4 files changed, 10 insertions, 10 deletions

diff --git a/.gitmodules b/.gitmodules
index 11631f6f7..13b037329 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "contrib/gana"]
-        path = contrib/gana
+[submodule "gana"]
+        path = src/gana
         url = git://git.gnunet.org/gana.git
-[submodule "doc/sphinx"]
-        path = contrib/sphinx
+[submodule "handbook"]
+        path = src/handbook
         url = https://git.gnunet.org/gnunet-handbook
diff --git a/Makefile.am b/Makefile.am
index 1f32efa78..35e4ef83c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,10 +72,10 @@ endif
 gana: gana-gns gana-gnunet-signatures
 
 gana-gns:
-        @cd $(top_srcdir)/contrib/gana/gnu-name-system-record-types; make; cp gnu_name_system_record_types.h ../../../src/include/
-        @cd $(top_srcdir)/contrib/gana/gnu-name-system-default-tlds; make; cp tlds.conf ../../../src/gns
+        @cd $(top_srcdir)/src/gana/gnu-name-system-record-types; make; cp gnu_name_system_record_types.h ../../../src/include/
+        @cd $(top_srcdir)/src/gana/gnu-name-system-default-tlds; make; cp tlds.conf ../../../src/gns
 
 gana-gnunet-signatures:
-        @cd $(top_srcdir)/contrib/gana/gnunet-signatures; make; cp gnunet_signatures.h ../../../src/include
+        @cd $(top_srcdir)/src/gana/gnunet-signatures; make; cp gnunet_signatures.h ../../../src/include
 
 
diff --git a/bootstrap b/bootstrap
index 69f2cc863..c8ab88b33 100755
--- a/bootstrap
+++ b/bootstrap
@@ -107,7 +107,7 @@ sphinx_update()
     echo "Updating handbook..."
     if existence sphinx-build; then
       cwd=$PWD
-      cd contrib/sphinx || exit 1
+      cd src/handbook || exit 1
       if test -e _build; then
         make clean
       fi
@@ -139,7 +139,7 @@ gana_update()
     echo "Updating GANA..."
     if existence recfmt; then
       cwd=$PWD
-      cd contrib/gana || exit 1
+      cd src/gana || exit 1
       # GNS
       echo "Updating GNS record types"
       cd gnu-name-system-record-types && \
diff --git a/meson-dist-script b/meson-dist-script
index dbc3e0ba8..fb328af9b 100644
--- a/meson-dist-script
+++ b/meson-dist-script
@@ -13,7 +13,7 @@ cd "${MESON_DIST_ROOT}"
 echo "Updating handbook..."
 if existence sphinx-build; then
   cwd=$PWD
-  cd contrib/sphinx || exit 1
+  cd src/handbook || exit 1
   if test -e _build; then
     make clean
   fi