[gnunet] 02/02: meson: fix new folder structure

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 97afa94de1d69df4c2fde0c85785e574d9e8ce17
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Mon Oct 16 15:54:43 2023 +0200

    meson: fix new folder structure
---
 contrib/meson.build           | 27 ---------------------------
 {contrib => data}/meson.build | 11 -----------
 scripts/meson.build           | 12 ++++++++++++
 3 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/contrib/meson.build b/contrib/meson.build
index ff8a0a989..a1acbb32c 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -1,33 +1,6 @@
 subdir('conf')
-subdir('hellos')
 subdir('scripts')
 
-
-install_data(['gns'/'def.tex',
-              'gns'/'gns-bcd.html',
-              'gns'/'gns-bcd.tex',
-              'gns'/'gns-bcd-forbidden.html',
-              'gns'/'gns-bcd-internal-error.html',
-              'gns'/'gns-bcd-invalid-key.html',
-              'gns'/'gns-bcd-not-found.html',
-              'gns'/'gns-bcd-png.tex',
-              'gns'/'gns-bcd-simple.html',
-              'gns'/'gns-bcd-simple.tex',
-              'fcfsd'/'fcfsd-index.html',
-              'fcfsd'/'fcfsd-forbidden.html',
-              'fcfsd'/'fcfsd-notfound.html',
-              'branding'/'logo'/'gnunet-logo.png',
-              'branding'/'logo'/'gnunet-logo-dark-text.svg',
-              'branding'/'logo'/'gnunet-logo-dark-only-text.svg',
-              'testing_hostkeys.ecc',
-              'netjail'/'netjail_core.sh',
-              'netjail'/'netjail_exec.sh',
-              'netjail'/'netjail_start.sh',
-              'netjail'/'netjail_stop.sh',
-              'netjail'/'topo.sh',
-              ],
-              install_dir: get_option('datadir')/'gnunet')
-
 install_data('xdg-scheme-handler'/'gnunet-uri.desktop',
              install_dir: get_option('datadir')/'applications')
 
diff --git a/contrib/meson.build b/data/meson.build
similarity index 70%
copy from contrib/meson.build
copy to data/meson.build
index ff8a0a989..20de89900 100644
--- a/contrib/meson.build
+++ b/data/meson.build
@@ -1,6 +1,4 @@
-subdir('conf')
 subdir('hellos')
-subdir('scripts')
 
 
 install_data(['gns'/'def.tex',
@@ -20,14 +18,5 @@ install_data(['gns'/'def.tex',
               'branding'/'logo'/'gnunet-logo-dark-text.svg',
               'branding'/'logo'/'gnunet-logo-dark-only-text.svg',
               'testing_hostkeys.ecc',
-              'netjail'/'netjail_core.sh',
-              'netjail'/'netjail_exec.sh',
-              'netjail'/'netjail_start.sh',
-              'netjail'/'netjail_stop.sh',
-              'netjail'/'topo.sh',
               ],
               install_dir: get_option('datadir')/'gnunet')
-
-install_data('xdg-scheme-handler'/'gnunet-uri.desktop',
-             install_dir: get_option('datadir')/'applications')
-
diff --git a/scripts/meson.build b/scripts/meson.build
new file mode 100644
index 000000000..fd45de0d2
--- /dev/null
+++ b/scripts/meson.build
@@ -0,0 +1,12 @@
+install_data([
+              'netjail'/'netjail_core.sh',
+              'netjail'/'netjail_exec.sh',
+              'netjail'/'netjail_start.sh',
+              'netjail'/'netjail_stop.sh',
+              'netjail'/'topo.sh',
+              ],
+              install_dir: get_option('datadir')/'gnunet')
+
+install_data('xdg-scheme-handler'/'gnunet-uri.desktop',
+             install_dir: get_option('datadir')/'applications')
+

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.