grub2-efi-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/Makefile.am b/Makefile.am
  20 index c5f486e..395b0dd 100644
  21 --- a/Makefile.am
  22 +++ b/Makefile.am
  23 @@ -101,8 +101,8 @@ CLEANFILES += widthspec.h
  24  # Install config.h into platformdir
  25  platform_HEADERS = config.h
  26
  27 -pkglib_DATA += grub-mkconfig_lib
  28 -pkglib_DATA += update-grub_lib
  29 +pkgdata_DATA += grub-mkconfig_lib
  30 +pkgdata_DATA += update-grub_lib
  31
  32
  33  if COND_i386_coreboot
  34 diff --git a/conf/Makefile.common b/conf/Makefile.common
  35 index 751188b..bbd59cc 100644
  36 --- a/conf/Makefile.common
  37 +++ b/conf/Makefile.common
  38 @@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
  39
  40  man_MANS =
  41  noinst_DATA =
  42 -pkglib_DATA =
  43 +pkgdata_DATA =
  44  bin_SCRIPTS =
  45  sbin_SCRIPTS =
  46  bin_PROGRAMS =
  47 @@ -147,7 +147,7 @@ check_SCRIPTS =
  48  grubconf_DATA =
  49  check_PROGRAMS =
  50  noinst_SCRIPTS =
  51 -pkglib_SCRIPTS =
  52 +pkgdata_SCRIPTS =
  53  noinst_PROGRAMS =
  54  grubconf_SCRIPTS =
  55  noinst_LIBRARIES =
  56 diff --git a/gentpl.py b/gentpl.py
  57 index 3008b80..a935f4d 100644
  58 --- a/gentpl.py
  59 +++ b/gentpl.py
  60 @@ -512,7 +512,7 @@ def script(platform):
  61      r += "[+ ENDIF +]"
  62
  63      r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
  64 -$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
  65 +$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
  66  chmod a+x [+ name +]
  67  """)
  68
  69 diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
  70 index e5a2172..7f6a36d 100644
  71 --- a/util/grub-mknetdir.in
  72 +++ b/util/grub-mknetdir.in
  73 @@ -30,7 +30,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
  74  host_os=@host_os@
  75  localedir=@datadir@/locale
  76  datarootdir=@datarootdir@
  77 -pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
  78 +pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
  79
  80  self=`basename $0`
  81
  82 @@ -183,7 +183,7 @@ process_input_dir ()
  83              cp -f "$file" "$grubdir/"
  84          fi
  85      done
  86 -    for file in ${pkglib_DATA}; do
  87 +    for file in ${pkgdata_DATA}; do
  88         if test -f "${input_dir}/${file}"; then
  89              cp -f "${input_dir}/${file}" "$grubdir/"
  90         fi
  91 diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
  92 index eff7708..f6b96d4 100644
  93 --- a/util/grub-mkrescue.in
  94 +++ b/util/grub-mkrescue.in
  95 @@ -27,7 +27,7 @@ libdir=@libdir@
  96  PACKAGE_NAME=@PACKAGE_NAME@
  97  PACKAGE_TARNAME=@PACKAGE_TARNAME@
  98  PACKAGE_VERSION=@PACKAGE_VERSION@
  99 -pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 100 +pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 101
 102  self=`basename $0`
 103
 104 @@ -163,7 +163,7 @@ process_input_dir ()
 105              cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
 106          fi
 107      done
 108 -    for file in ${pkglib_DATA}; do
 109 +    for file in ${pkgdata_DATA}; do
 110         if test -f "${input_dir}/${file}"; then
 111              cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/
 112         fi
 113 diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in
 114 index b0dbf9b..92b7306 100644
 115 --- a/util/grub-mkstandalone.in
 116 +++ b/util/grub-mkstandalone.in
 117 @@ -27,7 +27,7 @@ libdir=@libdir@
 118  PACKAGE_NAME=@PACKAGE_NAME@
 119  PACKAGE_TARNAME=@PACKAGE_TARNAME@
 120  PACKAGE_VERSION=@PACKAGE_VERSION@
 121 -pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 122 +pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 123
 124  self=`basename $0`
 125
 126 @@ -163,7 +163,7 @@ for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${sour
 127      fi
 128  done
 129
 130 -for file in ${pkglib_DATA}; do
 131 +for file in ${pkgdata_DATA}; do
 132      if test -f "${source_directory}/${file}"; then
 133          cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/
 134      fi