diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
commit | e2a2cddf54e26ab2f6551c9d27b997472e5f4d45 (patch) | |
tree | 506c782411889ae8fe218db16eee680c7ae5e0e2 /community/mupen64plus | |
parent | 7927a6b6296eecd09c8d2f70e593a378768deabe (diff) | |
parent | 5e8a6a470237711ad18f12dde87deea6f2b8b0e0 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/kvirc/PKGBUILD
community/perl-gtk2-trayicon/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/krusader/PKGBUILD
extra/libproxy/PKGBUILD
extra/libreoffice/PKGBUILD
extra/openal/PKGBUILD
extra/postgresql/PKGBUILD
extra/razor/PKGBUILD
extra/subversion/PKGBUILD
extra/swt/PKGBUILD
extra/valgrind/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/git/PKGBUILD
testing/graphviz/PKGBUILD
testing/graphviz/install
testing/perl-xml-parser/PKGBUILD
Diffstat (limited to 'community/mupen64plus')
-rw-r--r-- | community/mupen64plus/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/community/mupen64plus/PKGBUILD b/community/mupen64plus/PKGBUILD index 5b3dca8af..a2f86d0f8 100644 --- a/community/mupen64plus/PKGBUILD +++ b/community/mupen64plus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 35335 2010-12-18 23:49:02Z svenstaro $ +# $Id: PKGBUILD 50291 2011-06-27 20:35:36Z jelle $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -7,7 +7,7 @@ pkgname=mupen64plus pkgver=1.99.4 -pkgrel=1 +pkgrel=2 pkgdesc='Nintendo64 Emulator' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/mupen64plus/' @@ -26,7 +26,7 @@ package() { cd mupen64plus-bundle-src-$pkgver # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid - ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man' LDCONFIG='true' + ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man/man6' LDCONFIG='true' } # vim: ts=2:sw=2:et |