Integrate import_gcry.py in autogen.sh.

diff --git a/autogen.sh b/autogen.sh
index 6751c8adc51ecde68eeaf3425066279c093b7b6b..94322b15e9fd19b8a559cbe46c3e3a1bcd1033f0 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,11 @@ set -e
 
 autoconf
 autoheader
+
 echo timestamp > stamp-h.in
+
+python util/import_gcry.py lib/libgcrypt/ .
+
 for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
   if test -e $rmk ; then
     ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`

diff --git a/util/import_gcry.py b/util/import_gcry.py
index ae5b767785177e6dbda2b9cacfd1044b7f929b75..698e6cffe0ee8f53a045451e41bbbb06b978a615 100644 (file)
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -27,7 +27,7 @@ if len (sys.argv) < 3:
 indir = sys.argv[1]
 outdir = sys.argv[2]
 
-basedir = os.path.join (outdir, "gcry")
+basedir = os.path.join (outdir, "lib/libgcrypt-grub")
 try:
     os.makedirs (basedir)
 except:
@@ -181,11 +181,11 @@ for cipher_file in cipher_files:
         if len (ciphernames) > 0 or len (mdnames) > 0:
             modname = cipher_file [0:len(cipher_file) - 2]
             if re.match (".*-glue$", modname):
-                modfiles = "gcry/cipher/%s gcry/cipher/%s" \
+                modfiles = "libgcrypt-grub/cipher/%s libgcrypt-grub/cipher/%s" \
                     % (cipher_file, cipher_file.replace ("-glue.c", ".c"))
                 modname = modname.replace ("-glue", "")
             else:
-                modfiles = "gcry/cipher/%s" % cipher_file
+                modfiles = "libgcrypt-grub/cipher/%s" % cipher_file
             modname = "gcry_%s" % modname
             chmsg = "(GRUB_MOD_INIT(%s)): New function\n" % modname
             if nch: