X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=inline;f=stage3%2Fcis-emacs;h=d9db20dd73d95ee4ac3b76e1f5c1e51572aac613;hb=5b913b7b528bb69a0c90583b8776d6d26b9cb189;hp=47d714c26cfc2342c8d751181d50d560f6c7a19b;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-emacs b/stage3/cis-emacs
index 47d714c..d9db20d 100755
--- a/stage3/cis-emacs
+++ b/stage3/cis-emacs
@@ -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,26 +9,18 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
-
-# Saves CFLAGS and CXXFLAGS, and clears them.
-save_flags_no_optimizations &&
-
-olddir=$(pwd) &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1}-build &&
+cd ${LFS_TMP}/${1}-build
 ../${1}/configure \
     --prefix=/usr \
     --libexecdir=/usr/sbin \
-    --with-x-toolkit=gtk &&
-make bootstrap &&
-make install &&
-ldconfig &&
+    --with-x-toolkit=gtk
+make bootstrap
+make install
+ldconfig
 
-# Restore original CFLAGS and CXXFLAGS values.
-restore_flags &&
-
-cat > /etc/skel/.emacs << "EOF" &&
+cat > /etc/skel/.emacs << "EOF"
 ;; ~/.emacs
 
 ;; Emacs initialization file
@@ -66,9 +60,4 @@ cat > /etc/skel/.emacs << "EOF" &&
 (setq compilation-scroll-output t)
 EOF
 
-# This is to remove a warning in WindowMaker when emacs is started.
-cp ${olddir}/resources/ColorGNU.xpm /usr/share/pixmaps &&
-chmod 644 /usr/share/pixmaps/ColorGNU.xpm
-
-# Return last error
 exit $?