diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-28 16:53:19 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-28 16:53:19 +0100 |
| commit | 01346da4de50d9eda2660653fcaae6c1abfaa28a (patch) | |
| tree | bd7bb7e3f004777c788f809c5a5a10a69839be13 /core/bash | |
| parent | 5bc312c4c7af74bbbb6042c5856bac6e53efa32c (diff) | |
| parent | 1b9f6dc846379470b620b5dbb9d4d7acd1de148c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx-chewing/PKGBUILD
community/fcitx-cloudpinyin/PKGBUILD
community/fcitx-rime/PKGBUILD
community/linux-tools/PKGBUILD
community/lxpanel/PKGBUILD
community/pdns/PKGBUILD
core/bash/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/json-c/PKGBUILD
extra/liblouis/PKGBUILD
extra/live-media/PKGBUILD
extra/samba/PKGBUILD
extra/transmission/PKGBUILD
social/opentracker/PKGBUILD
Diffstat (limited to 'core/bash')
| -rw-r--r-- | core/bash/PKGBUILD | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index b8946099e..631b28523 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174629 2013-01-05 10:20:51Z allan $ +# $Id: PKGBUILD 176041 2013-01-26 23:37:21Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -6,7 +6,7 @@ pkgname=bash _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' 'mips64el') license=('GPL') @@ -42,9 +42,7 @@ build() { export CFLAGS="${CFLAGS} ${_bashconfig[@]}" ./configure --prefix=/usr --with-curses --enable-readline \ - --host=$CHOST --build=$CHOST \ - --without-bash-malloc --with-installed-readline \ - --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info + --without-bash-malloc --with-installed-readline make } @@ -57,9 +55,10 @@ package() { 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/ |