xorg fonctionnel en mode vesa

[hvlinux.git] / stage3 / cis-tk

diff --git a/stage3/cis-tk b/stage3/cis-tk
index ae58dfe..1ba210e 100755 (executable)
--- a/stage3/cis-tk
+++ b/stage3/cis-tk
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -o errexit
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
@@ -6,32 +7,31 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
+cd ${LFS_TMP}/${1}
 export VERSION=$(echo ${1} | sed "s!tk\(.*\)!\1!g")
-export V=`echo $VERSION | cut -d "." -f 1,2` &&
-export DIR=$PWD &&
-cd unix &&
-sed -i "s/relid'/relid/" configure &&
+export V=`echo $VERSION | cut -d "." -f 1,2`
+export DIR=$PWD
+cd unix
+sed -i "s/relid'/relid/" configure
 ./configure \
     --prefix=/usr \
-    --enable-threads &&
-make &&
+    --enable-threads
+make
 sed -i -e "s:${DIR}/unix:/usr/lib:" \
-    -e "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh &&
+    -e "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh
 
-make install &&
-install -d /usr/include/tk${V}/unix &&
-install -m644 *.h /usr/include/tk${V}/unix/ &&
-install -d /usr/include/tk${V}/generic &&
-install -m644 ../generic/*.h /usr/include/tk${V}/generic/ &&
-rm -f /usr/include/tk${V}/generic/{tk,tkDecls,tkPlatDecls}.h &&
-ln -nsf ../../include/tk${V} /usr/lib/tk${V}/include &&
-ln -sf libtk${V}.so /usr/lib/libtk.so &&
-ln -sf wish${V} /usr/bin/wish &&
+make install
+install -d /usr/include/tk${V}/unix
+install -m644 *.h /usr/include/tk${V}/unix/
+install -d /usr/include/tk${V}/generic
+install -m644 ../generic/*.h /usr/include/tk${V}/generic/
+rm -f /usr/include/tk${V}/generic/{tk,tkDecls,tkPlatDecls}.h
+ln -nsf ../../include/tk${V} /usr/lib/tk${V}/include
+ln -sf libtk${V}.so /usr/lib/libtk.so
+ln -sf wish${V} /usr/bin/wish
 
 ldconfig
 
-# Return last error
 exit $?