projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ajout variable manquante HV_FONTS_DIR
[hvlinux.git]
/
stage3
/
cis-emacs
diff --git
a/stage3/cis-emacs
b/stage3/cis-emacs
index
47d714c
..
d9db20d
100755
(executable)
--- a/
stage3/cis-emacs
+++ b/
stage3/cis-emacs
@@
-1,4
+1,6
@@
#!/bin/sh
#!/bin/sh
+set -o errexit
+
# First argument of this script is the package name
# Reading system configuration informations, functions and package versions.
# 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)
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 \
../${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
;; ~/.emacs
;; Emacs initialization file
@@
-66,9
+60,4
@@
cat > /etc/skel/.emacs << "EOF" &&
(setq compilation-scroll-output t)
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 $?
exit $?