[arch-commits] Commit in grub/trunk (PKGBUILD)

[Allan McRae]

    Date: Saturday, August 16, 2008 @ 23:02:26
  Author: allan
Revision: 9039

upgpkg: grub 0.97-13
    ncurses rebuild

Modified:
  grub/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-17 03:01:55 UTC (rev 9038)
+++ PKGBUILD	2008-08-17 03:02:26 UTC (rev 9039)
@@ -3,7 +3,7 @@
 
 pkgname=grub
 pkgver=0.97
-pkgrel=12
+pkgrel=13
 pkgdesc="A GNU multiboot boot loader"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -63,9 +63,11 @@
       patch -Np1 -i ../040_all_grub-0.96-nxstack.patch || return 1
       # patch from frugalware to make it boot when more than 2GB ram installed
       patch -Np1 -i ../05-grub-0.97-initrdaddr.diff || return 1
-      CFLAGS="-static" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin
+      CFLAGS="-static" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+                           --mandir=/usr/share/man --infodir=/usr/share/info
     else
-      CFLAGS= ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin
+      CFLAGS= ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+                  --mandir=/usr/share/man --infodir=/usr/share/info
     fi
   fi
 
@@ -74,6 +76,8 @@
   install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst
   install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub
 
+  rm -f ${pkgdir}/usr/share/info/dir
+
   if [ "$DESTARCH" = "x86_64" ]; then
     # fool makepkg into building a x86_64 package
     export CARCH="x86_64"