From 93cbd0a2fc0c977b017af593bb72dcff8a5fd219 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 17 Jun 2016 12:04:16 +0000
Subject: main/kbd: move keymaps to /lib/kbd

---
 main/kbd/APKBUILD | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'main/kbd/APKBUILD')

diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD
index 4ca11648ef..8eb134f129 100644
--- a/main/kbd/APKBUILD
+++ b/main/kbd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kbd
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)"
 url="http://ftp.altlinux.org/pub/people/legion/kbd"
 arch="all"
@@ -42,6 +42,7 @@ prepare() {
 	mv qwerty/cz.map qwerty/cz-qwerty.map
 }
 
+_datadir=/lib/kbd
 build() {
 	cd "$_builddir"
 	./configure \
@@ -49,7 +50,7 @@ build() {
 		--host=$CHOST \
 		--disable-nls \
 		--prefix=/usr \
-		--datadir=/usr/share \
+		--datadir=$_datadir \
 		--htmldir=/usr/share/html/$pkgname \
 		|| return 1
 	make || return 1
@@ -60,14 +61,14 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 
 	# ro_win.map.gz is useless
-	rm -f "$pkgdir"/usr/share/keymaps/i386/qwerty/ro_win.map.gz
+	rm -f "$pkgdir"${_datadir}/keymaps/i386/qwerty/ro_win.map.gz
 
 	# Create additional name for Serbian latin keyboard
-	ln -s sr-cy.map.gz "$pkgdir"/usr/share/keymaps/i386/qwerty/sr-latin.map.gz
+	ln -s sr-cy.map.gz "$pkgdir"$_datadir/keymaps/i386/qwerty/sr-latin.map.gz
 
 	# The rhpl keyboard layout table is indexed by kbd layout names,
 	# so we need a Korean keyboard
-	ln -s us.map.gz "$pkgdir"/usr/share/keymaps/i386/qwerty/ko.map.gz
+	ln -s us.map.gz "$pkgdir"${_datadir}/keymaps/i386/qwerty/ko.map.gz
 
 	# Install html documentation
 	mkdir -p "$pkgdir"/usr/share/html/$pkgname
@@ -98,9 +99,10 @@ misc() {
 	arch="noarch"
 	depends=
 
-	mkdir -p "$subpkgdir"/usr/share/
+	mkdir -p "$subpkgdir"$_datadir
 	for dir in consolefonts consoletrans keymaps unimaps; do
-		mv "$pkgdir"/usr/share/${dir} "$subpkgdir"/usr/share/ || return 1
+		mv "$pkgdir"$_datadir/${dir} "$subpkgdir"/$_datadir/ \
+			|| return 1
 	done
 }
 
-- 
cgit v1.2.3