Conversion errexit stage3

[hvlinux.git] / stage3 / cis-sgml-common

diff --git a/stage3/cis-sgml-common b/stage3/cis-sgml-common
index e0c5695..955d25d 100755 (executable)
--- a/stage3/cis-sgml-common
+++ b/stage3/cis-sgml-common
@@ -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.
@@ -19,23 +21,22 @@ if [ $? -eq 0 ]; then
 fi
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
+cd ${LFS_TMP}/${1}
 # Autotools used with this package are very old, so we regenerate the autotools files.
-aclocal &&
-automake -acf &&
-autoconf &&
+aclocal
+automake -acf
+autoconf
 ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --mandir=/usr/share/man &&
-make &&
-make install &&
+    --mandir=/usr/share/man
+make
+make install
 install-catalog --add /etc/sgml/sgml-ent.cat \
-    /usr/share/sgml/sgml-iso-entities-8879.1986/catalog &&
+    /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
 install-catalog --add /etc/sgml/sgml-docbook.cat \
     /etc/sgml/sgml-ent.cat
 
-# Return last error
 exit $?