diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-20 07:15:10 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-20 07:19:36 +0000 |
| commit | 881e85da9456314a69022c9eb68e6004f9e6da62 (patch) | |
| tree | 2aeddbc7ea5aa854b9da6dc09fe3fcfbd492d6bf /main | |
| parent | 536e6c072f1ba73af1710ea75bd2000cfae65061 (diff) | |
| download | aports-881e85da9456314a69022c9eb68e6004f9e6da62.tar.bz2 aports-881e85da9456314a69022c9eb68e6004f9e6da62.tar.xz | |
main/kbd: move back to /usr/share for data
If you have separate /usr, then you probably want you / to be small. If
you want have your kbd keymap there early, the probably better copy it
instead of making the entire database available early. Thus, we move the
database to /usr/share, where it belongs.
http://bugs.alpinelinux.org/issues/4457#note-6
Diffstat (limited to 'main')
| -rw-r--r-- | main/kbd/APKBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD index 8eb134f129..bb64776d43 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=2 +pkgrel=3 pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)" url="http://ftp.altlinux.org/pub/people/legion/kbd" arch="all" @@ -42,7 +42,7 @@ prepare() { mv qwerty/cz.map qwerty/cz-qwerty.map } -_datadir=/lib/kbd +_datadir=/usr/share build() { cd "$_builddir" ./configure \ @@ -50,7 +50,7 @@ build() { --host=$CHOST \ --disable-nls \ --prefix=/usr \ - --datadir=$_datadir \ + --datadir=${_datadir} \ --htmldir=/usr/share/html/$pkgname \ || return 1 make || return 1 @@ -64,7 +64,7 @@ package() { 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"$_datadir/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 @@ -99,9 +99,9 @@ misc() { arch="noarch" depends= - mkdir -p "$subpkgdir"$_datadir + mkdir -p "$subpkgdir"${_datadir} for dir in consolefonts consoletrans keymaps unimaps; do - mv "$pkgdir"$_datadir/${dir} "$subpkgdir"/$_datadir/ \ + mv "$pkgdir"${_datadir}/${dir} "$subpkgdir"/${_datadir}/ \ || return 1 done } |