xorg fonctionnel en mode vesa

[hvlinux.git] / stage3 / cis-openjade

diff --git a/stage3/cis-openjade b/stage3/cis-openjade
index b56c9e5..da5b36d 100755 (executable)
--- a/stage3/cis-openjade
+++ b/stage3/cis-openjade
@@ -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,34 +9,33 @@ 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 \
     --enable-http \
     --disable-static \
     --enable-default-catalog=/etc/sgml/catalog \
     --enable-default-search-path=/usr/share/sgml \
-    --datadir=/usr/share/sgml/${1} &&
-make &&
-make install &&
-ln -sf openjade /usr/bin/jade &&
-ln -sf libogrove.so /usr/lib/libgrove.so &&
-ln -sf libospgrove.so /usr/lib/libspgrove.so &&
-ln -sf libostyle.so /usr/lib/libstyle.so &&
-install -m644 dsssl/catalog /usr/share/sgml/${1}/ &&
-install -m644 dsssl/*.{dtd,dsl,sgm} /usr/share/sgml/${1} &&
+    --datadir=/usr/share/sgml/${1}
+make
+make install
+ln -sf openjade /usr/bin/jade
+ln -sf libogrove.so /usr/lib/libgrove.so
+ln -sf libospgrove.so /usr/lib/libspgrove.so
+ln -sf libostyle.so /usr/lib/libstyle.so
+install -m644 dsssl/catalog /usr/share/sgml/${1}/
+install -m644 dsssl/*.{dtd,dsl,sgm} /usr/share/sgml/${1}
 install-catalog --add /etc/sgml/${1}.cat \
-    /usr/share/sgml/${1}/catalog &&
+    /usr/share/sgml/${1}/catalog
 install-catalog --add /etc/sgml/sgml-docbook.cat \
-    /etc/sgml/${1}.cat &&
+    /etc/sgml/${1}.cat
 
-var_add_path "SGML_BASE_DIR" /etc/profile "/usr/share/sgml" &&
-var_export   "SGML_BASE_DIR" /etc/profile &&
+var_add_path "SGML_BASE_DIR" /etc/profile "/usr/share/sgml"
+var_export   "SGML_BASE_DIR" /etc/profile
 
-var_add_path "SGML_CATALOGS_DIR" /etc/profile "/etc/sgml" &&
+var_add_path "SGML_CATALOGS_DIR" /etc/profile "/etc/sgml"
 var_export   "SGML_CATALOGS_DIR" /etc/profile
 
-# Return last error
 exit $?