grub2-bios-bzr/grub2_automake_1.11.2_pkglib_to_pkgdata.patch

   1 diff --git a/ChangeLog_Keshav b/ChangeLog_Keshav
   2 new file mode 100644
   3 index 0000000..0eafd65
   4 --- /dev/null
   5 +++ b/ChangeLog_Keshav
   6 @@ -0,0 +1,12 @@
   7 +2012-01-04  Keshav P R  <the.ridikulus.rat@gmail.com>
   8 +
   9 +       Fixes for automake 1.11.2
  10 +
  11 +       * conf/Makefile.common: Change pkglib_SCRIPTS to pkgdata_SCRIPTS.
  12 +       * conf/Makefile.common: Change pkglib_DATA to pkgdata_DATA.
  13 +       * Makefile.am: Likewise.
  14 +       * gentpl.py: Likewise.
  15 +       * util/grub-mkstandalone.in: Likewise.
  16 +       * util/grub-mknetdir.in: Likewise.
  17 +       * util/grub-mkrescue.in: Likewise.
  18 +       * util/grub-mkstandalone.in: Likewise.
  19 diff --git a/gentpl.py b/gentpl.py
  20 index 3008b80..a935f4d 100644
  21 --- a/gentpl.py
  22 +++ b/gentpl.py
  23 @@ -512,7 +512,7 @@ def script(platform):
  24      r += "[+ ENDIF +]"
  25
  26      r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
  27 -$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
  28 +$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
  29  chmod a+x [+ name +]
  30  """)
  31
  32 diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
  33 index 4f40616..bd05821 100644
  34 --- a/util/grub-mknetdir.in
  35 +++ b/util/grub-mknetdir.in
  36 @@ -181,7 +181,7 @@ process_input_dir ()
  37              cp -f "$file" "$grubdir/"
  38          fi
  39      done
  40 -    for file in ${pkglib_DATA}; do
  41 +    for file in ${pkgdata_DATA}; do
  42         if test -f "${input_dir}/${file}"; then
  43              cp -f "${input_dir}/${file}" "$grubdir/"
  44         fi
  45 diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
  46 index ccad5e0..f71d064 100644
  47 --- a/util/grub-mkrescue.in
  48 +++ b/util/grub-mkrescue.in
  49 @@ -29,7 +29,7 @@ libdir="@libdir@"
  50  PACKAGE_NAME=@PACKAGE_NAME@
  51  PACKAGE_TARNAME=@PACKAGE_TARNAME@
  52  PACKAGE_VERSION=@PACKAGE_VERSION@
  53 -pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
  54 +pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
  55
  56  self=`basename $0`
  57
  58 @@ -165,7 +165,7 @@ process_input_dir ()
  59              cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
  60          fi
  61      done
  62 -    for file in ${pkglib_DATA}; do
  63 +    for file in ${pkgdata_DATA}; do
  64         if test -f "${input_dir}/${file}"; then
  65              cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/
  66         fi
  67 diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
  68 index 13cf9df..dbf1c57 100644
  69 --- a/util/grub-mkstandalone.in
  70 +++ b/util/grub-mkstandalone.in
  71 @@ -29,7 +29,7 @@ libdir="@libdir@"
  72  PACKAGE_NAME=@PACKAGE_NAME@
  73  PACKAGE_TARNAME=@PACKAGE_TARNAME@
  74  PACKAGE_VERSION=@PACKAGE_VERSION@
  75 -pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
  76 +pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
  77
  78  self=`basename $0`
  79
  80 @@ -165,7 +165,7 @@ for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${sour
  81      fi
  82  done
  83
  84 -for file in ${pkglib_DATA}; do
  85 +for file in ${pkgdata_DATA}; do
  86      if test -f "${source_directory}/${file}"; then
  87          cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/
  88      fi