[arch-commits] CVS update of core/base/bash (PKGBUILD)

[Tobias Powalowski]

    Date: Thursday, October 25, 2007 @ 02:01:17
  Author: tpowa
    Path: /home/cvs-core/core/base/bash

Modified: PKGBUILD (1.47 -> 1.48)

'upgpkg: fixed #5601'


----------+
 PKGBUILD |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


Index: core/base/bash/PKGBUILD
diff -u core/base/bash/PKGBUILD:1.47 core/base/bash/PKGBUILD:1.48
--- core/base/bash/PKGBUILD:1.47	Mon Sep 17 14:32:58 2007
+++ core/base/bash/PKGBUILD	Thu Oct 25 02:01:17 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.47 2007/09/17 18:32:58 thomas Exp $
+# $Id: PKGBUILD,v 1.48 2007/10/25 06:01:17 tpowa Exp $
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=bash
@@ -57,16 +57,16 @@
   done
   patch -Np1 -i ../bash-noinfo.patch || return 1
   ./configure --prefix=/usr --with-curses --enable-readline \
-    --without-bash-malloc --with-installed-readline
+    --without-bash-malloc --with-installed-readline \
+    --bindir=/bin
   make || return 1
   make DESTDIR=${startdir}/pkg install
-  mv ${startdir}/pkg/usr/bin ${startdir}/pkg/bin
   # we don't want bashbug
-  rm -f ${startdir}/pkg/bin/bashbug
-  rm -f ${startdir}/pkg/usr/man/man1/bashbug.1
-  mkdir -p ${startdir}/pkg/etc
-  install -m644 ../profile ${startdir}/pkg/etc/profile
-  ln -sf ${pkgname} ${startdir}/pkg/bin/sh
+  cd ${startdir}/pkg
+  rm bin/bashbug usr/man/man1/bashbug.1
+
+  install -v -D -m644 ${startdir}/src/profile etc/profile
+  ln -sf bash bin/sh
 
   mkdir -p $startdir/pkg/etc/skel/
   install -D -m644 $startdir/src/bashrc $startdir/pkg/etc/skel/.bashrc