package/boot/grub/fix_automake_1.11.2.patch

   1 --- grub-0.97/stage2/Makefile.am.vanilla        2012-01-12 13:55:45.191436065 +0100
   2 +++ grub-0.97/stage2/Makefile.am        2012-01-12 13:56:55.138969165 +0100
   3 @@ -27,12 +27,12 @@
   4         -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
   5
   6  # Stage 2 and Stage 1.5's.
   7 -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
   8 +pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
   9
  10  EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
  11
  12  if DISKLESS_SUPPORT
  13 -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
  14 +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
  15         ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
  16         reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
  17         nbgrub pxegrub
  18 @@ -43,7 +43,7 @@
  19         reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
  20         xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
  21  else
  22 -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
  23 +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
  24         ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
  25         reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
  26  noinst_DATA = pre_stage2 start start_eltorito
  27 @@ -114,7 +114,7 @@
  28  BUILT_SOURCES = stage2_size.h
  29  endif
  30
  31 -CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
  32 +CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES)
  33
  34  stage2_size.h: pre_stage2
  35         -rm -f stage2_size.h
  36 --- grub-0.97/stage1/Makefile.am.vanilla        2012-01-12 13:55:04.827376477 +0100
  37 +++ grub-0.97/stage1/Makefile.am        2012-01-12 13:55:31.915377291 +0100
  38 @@ -1,7 +1,7 @@
  39 -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
  40 -nodist_pkglib_DATA = stage1
  41 +pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
  42 +nodist_pkgdata_DATA = stage1
  43
  44 -CLEANFILES = $(nodist_pkglib_DATA)
  45 +CLEANFILES = $(nodist_pkgdata_DATA)
  46
  47  # We can't use builtins or standard includes.
  48  AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc