From ef8fd03c3310d3733a8b0b3cb8ccafbf8a8ff1ee Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 19 Dec 2006 07:39:44 +0000 Subject: Makefile adjustments for installation rules: added all the newer scripts/ added pacman.d and abs sysconf subdirs Minor makepkg revert for previous change to 'errexit' shell option --- scripts/makepkg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/makepkg') diff --git a/scripts/makepkg b/scripts/makepkg index aa53990a..cec871e7 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -736,6 +736,10 @@ fi # build msg "Starting build()..." +#check for "exit on syntax error" shell option +echo $SHELLOPTS | grep errexit 2>&1 >/dev/null +set_e=$? + if [ "x$LOGGING" = "1" ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" if [ -f "$BUILDLOG" ]; then @@ -750,10 +754,6 @@ if [ "x$LOGGING" = "1" ]; then mv "$BUILDLOG" "$BUILDLOG.$i" fi - #check for "exit on syntax error" shell option - echo $SHELLOPTS | grep errexit 2>&1 >/dev/null - set_e=$? - #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e build 2>&1 | tee "$BUILDLOG" -- cgit v1.2.3-70-g09d2