build: fix and refactor scripts

13 files changed, 23 insertions, 37 deletions

diff --git a/bin/Makefile.am b/bin/Makefile.am
deleted file mode 100644
index 18fccda56..000000000
--- a/bin/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTRA_DIST = \
-  dosubst.awk \
-  grephdr.sh \
-  grepsrc.sh \
-  pogen.sh \
-        sphinx_update.sh \
-        gana_update.sh \
-  rename.sh
diff --git a/bin/meson.build b/bin/meson.build
deleted file mode 100644
index e98bd2fb3..000000000
--- a/bin/meson.build
+++ /dev/null
@@ -1,16 +0,0 @@
-binfiles = [
-  'dosubst.awk',
-  'grephdr.sh',
-  'grepsrc.sh',
-  'pogen.sh',
-  'rename.sh',
-  'gana_update.sh',
-  'sphinx_update.sh',
-  ]
-
-foreach f : binfiles
-  configure_file(input : f,
-    output : f,
-    copy: true)
-endforeach
-
diff --git a/bootstrap b/bootstrap
index 348c2ce44..5698c39f6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -75,23 +75,18 @@ check_libtool()
 {
     echo "checking for libtoolize / libtool... "
 
+    . "scripts/gana_update.sh" || exit 1
+    . "scripts/sphinx_update.sh" || exit 1
     if existence libtool || \
        existence libtoolize || \
        existence glibtoolize || \
        existence slibtool; then
-        if existence autoreconf; then
-          autoreconf -if
-        elif ! existence meson; then
-          echo "*** No autoconf or meson installed, please install either ***"
-          exit 1
-        fi
-        . "bin/pogen.sh" || exit 1
-        . "bin/gana_update.sh" || exit 1
-        . "bin/sphinx_update.sh" || exit 1
-    else
-        echo "*** No libtoolize (libtool) or libtool found, please install it ***" >&2;
+        autoreconf -if
+    elif ! existence meson
+        echo "*** No libtoolize (libtool) or libtool or meson found, please install it ***" >&2;
         exit 1
     fi
+    . "scripts/pogen.sh" || exit 1
 }
 
 submodules()
diff --git a/configure.ac b/configure.ac
index 0e1bbb75a..8cc00d1de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1212,7 +1212,6 @@ AC_DEFINE_UNQUOTED([VCS_VERSION], [$vcs_version],
 
 AC_CONFIG_FILES([
 Makefile
-bin/Makefile
 contrib/Makefile
 data/Makefile
 data/hellos/Makefile
diff --git a/meson-dist-script b/meson-dist-script
index 4695439df..e5e9287dc 100644
--- a/meson-dist-script
+++ b/meson-dist-script
@@ -3,4 +3,4 @@
 set -eu
 
 cd "${MESON_DIST_ROOT}"
-. ./bin/sphinx_update.sh
+. ./scripts/sphinx_update.sh
diff --git a/bin/dosubst.awk b/scripts/dosubst.awk
index 3ed0403dd..3ed0403dd 100755
--- a/bin/dosubst.awk
+++ b/scripts/dosubst.awk
diff --git a/bin/gana_update.sh b/scripts/gana_update.sh
index 0707433f5..0707433f5 100755
--- a/bin/gana_update.sh
+++ b/scripts/gana_update.sh
diff --git a/bin/grephdr.sh b/scripts/grephdr.sh
index dd9050335..dd9050335 100755
--- a/bin/grephdr.sh
+++ b/scripts/grephdr.sh
diff --git a/bin/grepsrc.sh b/scripts/grepsrc.sh
index eb2d5e462..eb2d5e462 100755
--- a/bin/grepsrc.sh
+++ b/scripts/grepsrc.sh
diff --git a/scripts/meson.build b/scripts/meson.build
index fd45de0d2..830bec0c4 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -10,3 +10,19 @@ install_data([
 install_data('xdg-scheme-handler'/'gnunet-uri.desktop',
              install_dir: get_option('datadir')/'applications')
 
+binfiles = [
+  'dosubst.awk',
+  'grephdr.sh',
+  'grepsrc.sh',
+  'pogen.sh',
+  'rename.sh',
+  'gana_update.sh',
+  'sphinx_update.sh',
+  ]
+
+foreach f : binfiles
+  configure_file(input : f,
+    output : f,
+    copy: true)
+endforeach
+
diff --git a/bin/pogen.sh b/scripts/pogen.sh
index a68152bf4..a68152bf4 100755
--- a/bin/pogen.sh
+++ b/scripts/pogen.sh
diff --git a/bin/rename.sh b/scripts/rename.sh
index eec77e277..eec77e277 100755
--- a/bin/rename.sh
+++ b/scripts/rename.sh
diff --git a/bin/sphinx_update.sh b/scripts/sphinx_update.sh
index 6d589667c..6d589667c 100755
--- a/bin/sphinx_update.sh
+++ b/scripts/sphinx_update.sh