Merge stage1 x86_64 dans trunk

[hvlinux.git] / stage1 / cis-ac

diff --git a/stage1/cis-ac b/stage1/cis-ac
index 9d7a283..bf6a869 100755 (executable)
--- a/stage1/cis-ac
+++ b/stage1/cis-ac
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name.
 # Remaining arguments are additional configure options.
 
@@ -12,14 +14,8 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${PACKAGE} &&
+apply_patches ${PACKAGE}
 
-cd ${LFS_TMP}/${PACKAGE}-build &&
-../${PACKAGE}/configure \
-    --prefix=/tools \
-    ${CONFIGURE_OPTS} &&
-make &&
-make install
+${SCRDIR}/cis-common ${PACKAGE} ${CONFIGURE_OPTS}
 
-# Return last error
 exit $?