Mercurial > vanilla

changeset 4:eca495bb269c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib/zlib: cleanup
author David Demelier <markand@malikania.fr>
date Fri, 22 Feb 2019 12:48:10 +0100
parents 585b2bd0d147
children c55372164bd9
files lib/zlib/zlib.sh
diffstat 1 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/lib/zlib/zlib.sh	Fri Feb 22 12:48:03 2019 +0100
+++ b/lib/zlib/zlib.sh	Fri Feb 22 12:48:10 2019 +0100
@@ -35,19 +35,18 @@
 	;;
 esac
 
+set -e
 rm -rf $DSTDIR $OBJDIR
 
-mkdir -p $DSTDIR $OBJDIR && cd $OBJDIR
-tar xvzf $CWD/$PKGNAME-$PKGVERSION.tar.gz || exit 1
-cd $PKGNAME-$PKGVERSION || exit 1
+mkdir -p $DSTDIR $OBJDIR $OUTDIR && cd $OBJDIR
+tar xvzf $CWD/$PKGNAME-$PKGVERSION.tar.gz
+cd $PKGNAME-$PKGVERSION
 
-CFLAGS="$CFLAGS" \
-	./configure \
-       	--prefix=/usr
-make || exit 1
+CFLAGS="$CFLAGS" ./configure --prefix=/usr
+make
 make install DESTDIR=$DSTDIR
 
-cd $OBJDIR
+cd $DSTDIR
 vpk package $OUTDIR/$PKGNAME-$PKGVERSION-$ARCH.txz
 
-#rm -rf $DSTDIR $OBJDIR
+rm -rf $DSTDIR $OBJDIR