compile fixes; handle new naming scheme in install-grub script

PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=grub
 pkgver=0.97
-pkgrel=17
+pkgrel=18
 pkgdesc="A GNU multiboot boot loader"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,20 +19,22 @@ source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
         more-raid.patch
         intelmac.patch
         grub-inode-size.patch
-	ext4.patch)
+	ext4.patch
+	grub-0.97-ldflags-objcopy-remove-build-id.patch)
 backup=('boot/grub/menu.lst')
 install=grub.install
-md5sums=('cd3f3eb54446be6003156158d51f4884'
-         'a2098dc41fc3cb13e53179de2979d088'
-         '3182c4ae4963a16930bc772bba89dacf'
-         'eb9d69c46af3a0667c1f651817d7f075'
-         'ccd2d757e79e3a03dc19ede7391ed328'
-         '826fdbf446067f9861baf9f6a69a4583'
-         '49f6d4bcced0bc8bbcff273f3254bbfa'
-         'f41f702014a064918d7afc6fc23baa6e'
-         '175dc6b9f4ab94e8056c3afb3e34460a'
-         '69c648d2b8d0965df70a74014424f31c'
-         '39e0f9a05b7e04aceb24fc7bc4893e3d')
+sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
+          '734fa37ebe1657bf1f8f74ee4866953ff96f2604'
+          '5479f098c71817ac86d0059cf1c77ca169a6fd93'
+          '157b81dbad3576536b08642242accfa1aeb093a9'
+          'adbb4685c98797ffb4dc83561ec75698991dddbd'
+          'f2e0dff29a7c8a45e90aa07298a1b2a9a9d29afc'
+          'c5e2c94ed0e759590b9eb38c9d979f075d19d7c0'
+          '45fe668a3779664fb292591f426976b6c784d6c8'
+          '066d7ab1ae442f88e94c9e4f1867ac6682965d06'
+          '0436aa6fa0b6f768289172f983a3f4b69384629e'
+          'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
+          '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -42,26 +44,38 @@ build() {
   DESTARCH="x86_64"
   # optimizations break the build -- disable them
   # adding special devices to grub, patches are from fedora
-  patch -Np1 -i ../special-devices.patch || return 1
-  patch -Np1 -i ../i2o.patch || return 1
-  patch -Np1 -i ../more-raid.patch || return 1
-  patch -Np1 -i ../intelmac.patch || return 1
+  patch -Np1 -i ../special-devices.patch
+  patch -Np1 -i ../i2o.patch
+  patch -Np1 -i ../more-raid.patch
+  patch -Np1 -i ../intelmac.patch
   # Add support for bigger inode size to e2fs_stage1_5
-  patch -Np1 -i ../grub-inode-size.patch || return 1
+  patch -Np1 -i ../grub-inode-size.patch
   # Add ext4 support
   # http://www.mail-archive.com/bug-grub@gnu.org/msg11458.html
-  patch -Np1 -i ../ext4.patch || return 1
+  patch -Np1 -i ../ext4.patch
+  # binutils fix
+  patch -Np1 -i ../grub-0.97-ldflags-objcopy-remove-build-id.patch
+
+  sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
+  sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
+
+  ## recreate ./configure script with the required changes in LDFLAGS and objcopy
+  aclocal
+  autoconf
+  autoreconf
+  automake
 
   #arch64 fixes for static build
-  if [ "$CARCH" = "x86_64" ]; then
+  if [ "$CARCH" = "x86_64" ]; then  ## correcting problems for new wersion of autotools
+
     echo "this package has to be built on i686, won't compile on x86_64"
     sleep 5
   else
     if [ "$DESTARCH" = "x86_64" ]; then
       # patch from gentoo for fixing a segfault
-      patch -Np1 -i ../040_all_grub-0.96-nxstack.patch || return 1
+      patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
       # patch from frugalware to make it boot when more than 2GB ram installed
-      patch -Np1 -i ../05-grub-0.97-initrdaddr.diff || return 1
+      patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
       CFLAGS="-static" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
                            --mandir=/usr/share/man --infodir=/usr/share/info
     else
@@ -70,8 +84,8 @@ build() {
     fi
   fi
 
-  CFLAGS= make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  CFLAGS= make
+  make DESTDIR=$pkgdir install
   install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
   install -D -m755 ../install-grub $pkgdir/sbin/install-grub