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

[allan at nymeria.archlinux.org]

    Date: Tuesday, January 22, 2013 @ 08:47:57
  Author: allan
Revision: 175821

upgpkg: bash 4.2.042-2

install to /usr/bin and symlink as needed in /bin - will help with future /bin removal

Modified:
  bash/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-22 06:29:20 UTC (rev 175820)
+++ PKGBUILD	2013-01-22 07:47:57 UTC (rev 175821)
@@ -6,7 +6,7 @@
 _basever=4.2
 _patchlevel=042 #prepare for some patches
 pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNU Bourne Again shell"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -42,8 +42,7 @@
   export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
 
   ./configure --prefix=/usr --with-curses --enable-readline \
-    --without-bash-malloc --with-installed-readline \
-    --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
+    --without-bash-malloc --with-installed-readline
   make
 }
 
@@ -56,9 +55,10 @@
   cd ${srcdir}/${pkgname}-$_basever
   make DESTDIR=${pkgdir} install
 
-  # for now, bash is our default /bin/sh
-  cd ${pkgdir}/bin
-  ln -s bash sh
+  # put needed symlinks in /bin
+  install -dm755  ${pkgdir}/bin
+  ln -s ../usr/bin/bash ${pkgdir}/bin/bash
+  ln -s ../usr/bin/bash ${pkgdir}/bin/sh
 
   install -dm755 ${pkgdir}/etc/skel/