MErge en cours x86_64 -> trunk

[hvlinux.git] / stage2 / cis-gzip

diff --git a/stage2/cis-gzip b/stage2/cis-gzip
index c2433bc..080d4cb 100755 (executable)
--- a/stage2/cis-gzip
+++ b/stage2/cis-gzip
@@ -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,16 +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}
 ./configure \
     --prefix=/usr \
-    --bindir=/bin &&
-make -j ${MAKEJOBS} &&
-make install &&
+    --bindir=/bin
+make -j ${MAKEJOBS}
+make install
 
-mv -fv /bin/{gzexe,uncompress,zcmp,zdiff,zegrep} /usr/bin &&
+# Move some programs that do not need to be on the root filesystem:
+mv -fv /bin/{gzexe,uncompress,zcmp,zdiff,zegrep} /usr/bin
 mv -fv /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin
 
 # Return last error