X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-emacs;h=93e91ba2816da68b09aeffdb8836cd448f2d7aca;hb=08838842e4a51c1af27915e8f627937d2dfa8e37;hp=47d714c26cfc2342c8d751181d50d560f6c7a19b;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-emacs b/stage3/cis-emacs
index 47d714c..93e91ba 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,68 +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 &&
+apply_patches ${1}
 
-olddir=$(pwd) &&
-
-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 &&
-
-# Restore original CFLAGS and CXXFLAGS values.
-restore_flags &&
-
-cat > /etc/skel/.emacs << "EOF" &&
-;; ~/.emacs
-
-;; Emacs initialization file
-
-;; Are we running XEmacs or Emacs?
-(defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version))
-
-;; Set up the keyboard so the delete key on both the regular keyboard
-;; and the keypad delete the character under the cursor and to the right
-;; under X, instead of the default, backspace behavior.
-(global-set-key [delete] 'delete-char)
-(global-set-key [kp-delete] 'delete-char)
-
-;; Do not display a splash screen on startup
-(setq inhibit-splash-screen t)
-
-;; Turn on font-lock mode for Emacs
-(cond ((not running-xemacs)
-	(global-font-lock-mode t)
-))
-
-;; Always end a file with a newline
-(setq require-final-newline t)
-
-;; Stop at the end of the file, not just add lines
-(setq next-line-add-newlines nil)
-
-;; Enable wheelmouse support by default
-(mwheel-install)
-(setq mwheel-follow-mouse t)
-
-;; Replaces tabs in files with spaces
-(setq-default indent-tabs-mode nil)
-
-;; Makes the compilation buffer always scrolls to follow
-;; output as it comes in.
-(setq compilation-scroll-output t)
-EOF
+    --with-x-toolkit=gtk
+make bootstrap
+make install
+ldconfig
 
-# 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
+install -m644 ${SCRDIR}/resources/emacsrc /etc/skel/.emacs
+install -m644 ${SCRDIR}/resources/emacsrc /root/.emacs
 
-# Return last error
 exit $?