Réorganisation des stages

[hvlinux.git] / stage2 / cis-kbd

diff --git a/stage2/cis-kbd b/stage2/cis-kbd
index 2b752b8..34bda08 100755 (executable)
--- a/stage2/cis-kbd
+++ b/stage2/cis-kbd
@@ -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.
@@ -6,23 +8,27 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-# Applying patches (if any)
-apply_patches ${1} &&
+cd ${LFS_TMP}/${1}
 
-cd ${LFS_TMP}/${1} &&
+# The Kbd package doesn't come shipped with the standard configure scripts, so generate them now:
+autoreconf
+
+# Applying patches (if any)
+apply_patches ${1}
 
 # --datadir=/lib/kbd 
 #     This option puts keyboard layout data in a directory that will
 #     always be on the root partition instead of the default /usr/share/kbd
+cd ${LFS_TMP}/${1}
 ./configure \
-    --datadir=/lib/kbd &&
-make -j ${MAKEJOBS} &&
-make install &&
+    --prefix=/usr \
+    --datadir=/lib/kbd
+make -j ${MAKEJOBS}
+make install
 
 # Some of the scripts in the LFS-Bootscripts package depend on kbd_mode,
 # openvt, and setfont. As /usr may not be available during the early stages
 # of booting, those binaries need to be on the root partition:
-mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin
+mv -v /usr/bin/{kbd_mode,loadkeys,openvt,setfont} /bin
 
-# Return last error
 exit $?