Commit 1697ee32 authored by Allan McRae's avatar Allan McRae
Browse files

Remove error check form PKGBUILD protos



makepkg will handle this automatically with pacman-3.4

Signed-off-by: Allan McRae's avatarAllan McRae <allan@archlinux.org>
parent 1d67587c
...@@ -54,6 +54,6 @@ build() { ...@@ -54,6 +54,6 @@ build() {
./autogen.sh ./autogen.sh
./configure --prefix=/usr ./configure --prefix=/usr
make || return 1 make
make DESTDIR="$pkgdir/" install make DESTDIR="$pkgdir/" install
} }
...@@ -55,6 +55,6 @@ build() { ...@@ -55,6 +55,6 @@ build() {
./autogen.sh ./autogen.sh
./configure --prefix=/usr ./configure --prefix=/usr
make || return 1 make
make DESTDIR="$pkgdir/" install || return 1 make DESTDIR="$pkgdir/" install
} }
...@@ -58,6 +58,6 @@ build() { ...@@ -58,6 +58,6 @@ build() {
./autogen.sh ./autogen.sh
./configure --prefix=/usr ./configure --prefix=/usr
make || return 1 make
make DESTDIR="$pkgdir/" install make DESTDIR="$pkgdir/" install
} }
...@@ -54,6 +54,6 @@ build() { ...@@ -54,6 +54,6 @@ build() {
./autogen.sh ./autogen.sh
./configure --prefix=/usr ./configure --prefix=/usr
make || return 1 make
make DESTDIR="$pkgdir/" install make DESTDIR="$pkgdir/" install
} }
...@@ -30,12 +30,12 @@ md5sums=() #generate with 'makepkg -g' ...@@ -30,12 +30,12 @@ md5sums=() #generate with 'makepkg -g'
build() { build() {
cd "$srcdir/$pkgname-$pkgver" cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc \ ./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-scrollkeeper || return 1 --localstatedir=/var --disable-scrollkeeper
make || return 1 make
make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install || return 1 make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install
install -m755 -d "$pkgdir"/usr/share/gconf/schemas install -m755 -d "$pkgdir"/usr/share/gconf/schemas
gconf-merge-schema "$pkgdir"/usr/share/gconf/schemas/${pkgname}.schemas \ gconf-merge-schema "$pkgdir"/usr/share/gconf/schemas/${pkgname}.schemas \
"$pkgdir"/etc/gconf/schemas/*.schemas || return 1 "$pkgdir"/etc/gconf/schemas/*.schemas
rm -f "$pkgdir"/etc/gconf/schemas/*.schemas rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
} }
...@@ -28,16 +28,16 @@ md5sums=() ...@@ -28,16 +28,16 @@ md5sums=()
build() { build() {
cd "$srcdir/***-$pkgver" cd "$srcdir/***-$pkgver"
runhaskell Setup configure --prefix=/usr --enable-executable-stripping || return 1 runhaskell Setup configure --prefix=/usr --enable-executable-stripping
runhaskell Setup build || return 1 runhaskell Setup build
runhaskell Setup copy --destdir="$pkgdir/" || return 1 runhaskell Setup copy --destdir="$pkgdir/"
# #
# Setup registration phase for library packages # Setup registration phase for library packages
# Also requires an install script. See proto-haskell.install # Also requires an install script. See proto-haskell.install
# #
runhaskell Setup register --gen-script || return 1 runhaskell Setup register --gen-script
runhaskell Setup unregister --gen-script || return 1 runhaskell Setup unregister --gen-script
install -Dm744 register.sh "$pkgdir"/usr/share/haskell/$pkgname/register.sh install -Dm744 register.sh "$pkgdir"/usr/share/haskell/$pkgname/register.sh
install -m744 unregister.sh "$pkgdir"/usr/share/haskell/$pkgname/unregister.sh install -m744 unregister.sh "$pkgdir"/usr/share/haskell/$pkgname/unregister.sh
} }
......
...@@ -36,10 +36,10 @@ build() { ...@@ -36,10 +36,10 @@ build() {
if [ -d $_hgrepo ] ; then if [ -d $_hgrepo ] ; then
cd $_hgrepo cd $_hgrepo
hg pull -u || return 1 hg pull -u
msg "The local files are updated." msg "The local files are updated."
else else
hg clone $_hgroot $_hgrepo || return 1 hg clone $_hgroot $_hgrepo
fi fi
msg "Mercurial checkout done or server timeout" msg "Mercurial checkout done or server timeout"
...@@ -55,6 +55,6 @@ build() { ...@@ -55,6 +55,6 @@ build() {
./autogen.sh ./autogen.sh
./configure --prefix=/usr ./configure --prefix=/usr
make || return 1 make
make DESTDIR="$pkgdir/" install || return 1 make DESTDIR="$pkgdir/" install
} }
...@@ -29,9 +29,9 @@ build() { ...@@ -29,9 +29,9 @@ build() {
cd "$srcdir/***-$pkgver" cd "$srcdir/***-$pkgver"
# install module in vendor directories. # install module in vendor directories.
PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
make || return 1 make
make install DESTDIR="$pkgdir/" || return 1 make install DESTDIR="$pkgdir/"
## for packages with Build.PL, do this instead: ## for packages with Build.PL, do this instead:
# perl Build.PL installdirs=vendor destdir="$pkgdir/" # perl Build.PL installdirs=vendor destdir="$pkgdir/"
......
...@@ -51,6 +51,6 @@ build() { ...@@ -51,6 +51,6 @@ build() {
# #
./autogen.sh ./autogen.sh
./configure --prefix=/usr ./configure --prefix=/usr
make || return 1 make
make DESTDIR="$pkgdir/" install make DESTDIR="$pkgdir/" install
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment