MErge en cours x86_64 -> trunk

[hvlinux.git] / stage2 / cis-popt

diff --git a/stage2/cis-popt b/stage2/cis-popt
index ac238d5..1ccfaa4 100755 (executable)
--- a/stage2/cis-popt
+++ b/stage2/cis-popt
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name.
 
 # Reading system configuration informations, functions and package versions.
@@ -7,18 +9,17 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
+cd ${LFS_TMP}/${1}
 # fix taken backported from the development version of popt fixes
 # a problem identified by the included testsuite:
-sed -i -e "/*origOptString ==/c 0)" popt.c &&
+sed -i -e "/*origOptString ==/c 0)" popt.c
 
 ./configure \
     --prefix=/usr \
-    --sysconfdir=/etc &&
-make -j ${MAKEJOBS} &&
+    --sysconfdir=/etc
+make -j ${MAKEJOBS}
 make install
 
-# Return last error
 exit $?