Merge mainline into newreloc. For now without boot tests

[grub2.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 60139cfb33f6d93b1169f49e84b79d8761d2ccc1..f052499ae4ba4b8e22ce882aa17d0151b6640211 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,15 +1,8 @@
-#! /bin/sh
+#! /usr/bin/env bash
 
 set -e
 
-autogen --version >/dev/null || (echo autogen missing; exit 1)
-
-echo "Creating Makefile.tpl..."
-python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
-
-echo "Running autogen..."
-autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am
-autogen -T Makefile.tpl grub-core/modules.def | sed -e '/^$/{N;/^\n$/D;}' > grub-core/modules.am
+autogen --version >/dev/null || exit 1
 
 echo "Importing unicode..."
 python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
@@ -17,6 +10,14 @@ python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt
 echo "Importing libgcrypt..."
 python util/import_gcry.py grub-core/lib/libgcrypt/ grub-core
 
+echo "Creating Makefile.tpl..."
+python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+
+echo "Running autogen..."
+autogen -T Makefile.tpl Makefile.util.def | sed -e '/^$/{N;/^\n$/D;}' > Makefile.util.am
+autogen -T Makefile.tpl grub-core/Makefile.core.def | sed -e '/^$/{N;/^\n$/D;}' > grub-core/Makefile.core.am
+autogen -T Makefile.tpl grub-core/Makefile.gcry.def | sed -e '/^$/{N;/^\n$/D;}' > grub-core/Makefile.gcry.am
+
 echo "Saving timestamps..."
 echo timestamp > stamp-h.in