src/patches/grub-0.97/grub-0.97-path-patch

   1 diff -ur grub-0.93/Makefile.am grub-0.93.new/Makefile.am
   2 --- grub-0.93/Makefile.am       2002-07-01 16:15:36.000000000 +0200
   3 +++ grub-0.93.new/Makefile.am   2003-02-04 13:03:36.000000000 +0100
   4 @@ -2,3 +2,4 @@
   5  AUTOMAKE_OPTIONS = 1.5
   6  SUBDIRS = netboot stage2 stage1 lib grub util docs
   7  EXTRA_DIST = BUGS MAINTENANCE
   8 +pkgdatadir=$(datadir)
   9 diff -ur grub-0.93/stage1/Makefile.am grub-0.93.new/stage1/Makefile.am
  10 --- grub-0.93/stage1/Makefile.am        2002-09-08 03:58:08.000000000 +0200
  11 +++ grub-0.93.new/stage1/Makefile.am    2003-02-04 13:03:36.000000000 +0100
  12 @@ -1,4 +1,4 @@
  13 -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
  14 +pkglibdir = /usr/lib/grub
  15  nodist_pkglib_DATA = stage1
  16
  17  CLEANFILES = $(nodist_pkglib_DATA)
  18 diff -ur grub-0.93/stage2/Makefile.am grub-0.93.new/stage2/Makefile.am
  19 --- grub-0.93/stage2/Makefile.am        2002-11-29 19:00:53.000000000 +0100
  20 +++ grub-0.93.new/stage2/Makefile.am    2003-02-04 13:03:36.000000000 +0100
  21 @@ -26,7 +26,7 @@
  22         -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 -fwritable-strings
  23
  24  # Stage 2 and Stage 1.5's.
  25 -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
  26 +pkglibdir = /usr/lib/grub
  27
  28  EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
  29
  30 diff -ur grub-0.93/util/grub-install.in grub-0.93.new/util/grub-install.in
  31 --- grub-0.93/util/grub-install.in      2002-05-20 13:21:50.000000000 +0200
  32 +++ grub-0.93.new/util/grub-install.in  2003-02-04 13:03:36.000000000 +0100
  33 @@ -27,7 +27,7 @@
  34  host_cpu=@host_cpu@
  35  host_os=@host_os@
  36  host_vendor=@host_vendor@
  37 -pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
  38 +pkglibdir=${libdir}/${PACKAGE}/
  39
  40  grub_shell=${sbindir}/grub
  41  grub_set_default=${sbindir}/grub-set-default
  42 @@ -378,14 +378,19 @@
  43      exit 1
  44  fi
  45
  46 -# Copy the GRUB images to the GRUB directory.
  47 -for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
  48 -    rm -f $file || exit 1
  49 -done
  50 -for file in \
  51 -    ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do
  52 -    cp -f $file ${grubdir} || exit 1
  53 -done
  54 +# FHS says that /usr/share is used for architecture independent data,
  55 +# so all stage-files are directly installed to /usr/lib/grub.
  56 +# Therefor this part is no longer needed.
  57 +# <--cut_here-->
  58 +## Copy the GRUB images to the GRUB directory.
  59 +#for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
  60 +#    rm -f $file || exit 1
  61 +#done
  62 +#for file in \
  63 +#    ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do
  64 +#    cp -f $file ${grubdir} || exit 1
  65 +#done
  66 +# <--uncut-->
  67
  68  # Make sure that GRUB reads the same images as the host OS.
  69  test -n "$mkimg" && img_file=`$mkimg`
  70 Only in grub-0.93.new/util: grub-install.in.orig