[Lunar-commits] <moonbase-core> kbd: Cleanup BUILD file

[Stefan Wold]

commit 0609fe5165281a020a683d32b3ab057ace069a4d
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 16 Nov 2013 00:20:22 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/0609fe5165281a020a683d32b3ab057ace069a4d

kbd: Cleanup BUILD file

Should now halt properly on any error. We no longer require the symlink /bin/loadkeys.
---
  utils/kbd/BUILD | +14/-28   
  1 file changed, 14 insertions(+), 28 deletions(-)

--- a/utils/kbd/BUILD
+++ b/utils/kbd/BUILD
@@ -1,30 +1,16 @@
-(
+OPTS+=" --datadir=/usr/share/kbd"
 
-  # rename keymap files with the same names
-  # this is needed because when only name of keymap is specified
-  # loadkeys loads the first keymap it can find, which is bad
-  # this should be removed when upstream adopts the change
-  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
-  mv data/keymaps/i386/olpc/es{,-olpc}.map
-  mv data/keymaps/i386/olpc/pt{,-olpc}.map
-  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
-  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+# rename keymap files with the same names
+# this is needed because when only name of keymap is specified
+# loadkeys loads the first keymap it can find, which is bad
+# this should be removed when upstream adopts the change
+mv data/keymaps/i386/qwertz/cz{,-qwertz}.map &&
+mv data/keymaps/i386/olpc/es{,-olpc}.map &&
+mv data/keymaps/i386/olpc/pt{,-olpc}.map &&
+mv data/keymaps/i386/dvorak/no{,-dvorak}.map &&
+mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map &&
 
-  ./configure --prefix=/usr              \
-              --datadir=/usr/share/kbd   \
-              --mandir=/usr/share/man    \
-              $OPTS                     &&
-
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
-
-  prepare_install  &&
-
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install  &&
-
-  # this is needed because some init scripts might call /bin/loadkeys
-  # remove this when next versions of kbd
-  # and init scripts with only /usr/bin/loadkeys usage will be released
-  mkdir -p /usr/bin  &&
-  ln -sf /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
-
-) > $C_FIFO 2>&1
+default_config &&
+make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes &&
+prepare_install  &&
+make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install