|
 |
97155b |
diff -up console-setup/Makefile.orig console-setup/Makefile
|
|
|
97155b |
--- console-setup/Makefile.orig 2012-06-19 16:24:46.063272458 +0200
|
|
|
97155b |
+++ console-setup/Makefile 2012-06-20 13:11:09.926247002 +0200
|
|
|
97155b |
@@ -2,7 +2,7 @@ prefix = /usr/local
|
|
|
97155b |
# etcdir must be either /etc or
|
|
|
97155b |
etcdir = $(prefix)/etc
|
|
|
97155b |
bootprefix = $(patsubst %/usr,%/,$(prefix:%/=%))
|
|
|
97155b |
-mandir = $(prefix)/share/man
|
|
|
97155b |
+mandir = $(prefix)/usr/share/man
|
|
|
97155b |
|
|
|
97155b |
SHELL = /bin/sh
|
|
|
97155b |
|
|
|
97155b |
@@ -36,8 +36,8 @@ build-all: build-linux build-freebsd bui
|
|
|
97155b |
|
|
|
97155b |
.PHONY: install-common
|
|
|
97155b |
install-common: build-common
|
|
|
97155b |
- install -d $(bootprefix)/bin/
|
|
|
97155b |
- install setupcon $(bootprefix)/bin/
|
|
|
97155b |
+ install -d $(bootprefix)/usr/bin/
|
|
|
97155b |
+ install setupcon $(bootprefix)/usr/bin/
|
|
|
97155b |
install -d $(etcdir)/default
|
|
|
97155b |
install -m 644 config/keyboard $(etcdir)/default/
|
|
|
97155b |
install -m 644 config/console-setup $(etcdir)/default/
|
|
|
97155b |
@@ -49,10 +49,10 @@ install-common: build-common
|
|
|
97155b |
|
|
|
97155b |
.PHONY: install-common-linux
|
|
|
97155b |
install-common-linux: build-linux
|
|
|
97155b |
- install -d $(prefix)/share/consolefonts/
|
|
|
97155b |
- install -m 644 Fonts/*.psf.gz $(prefix)/share/consolefonts/
|
|
|
97155b |
- install -d $(prefix)/share/consoletrans
|
|
|
97155b |
- install -m 644 acm/*.acm.gz $(prefix)/share/consoletrans/
|
|
|
97155b |
+ install -d $(prefix)/usr/share/consolefonts/
|
|
|
97155b |
+ install -m 644 Fonts/*.psf.gz $(prefix)/usr/share/consolefonts/
|
|
|
97155b |
+ install -d $(prefix)/usr/share/consoletrans
|
|
|
97155b |
+ install -m 644 acm/*.acm.gz $(prefix)/usr/share/consoletrans/
|
|
|
97155b |
install -d $(etcdir)/console-setup
|
|
|
97155b |
install -m 644 Keyboard/compose.*.inc $(etcdir)/console-setup/
|
|
|
97155b |
install -m 644 Keyboard/remap.inc $(etcdir)/console-setup/
|
|
|
97155b |
@@ -77,8 +77,8 @@ install-ckbcomp:
|
|
|
97155b |
mkdir -p $(etcdir)/console-setup \
|
|
|
97155b |
&& cp -r Keyboard/ckb/ $(etcdir)/console-setup/ckb; \
|
|
|
97155b |
fi
|
|
|
97155b |
- install -d $(prefix)/bin/
|
|
|
97155b |
- install -m 755 Keyboard/ckbcomp $(prefix)/bin/
|
|
|
97155b |
+ install -d $(prefix)/usr/bin/
|
|
|
97155b |
+ install -m 755 Keyboard/ckbcomp $(prefix)/usr/bin/
|
|
|
97155b |
install -d $(mandir)/man1/
|
|
|
97155b |
install -m 644 man/ckbcomp.1 $(mandir)/man1/
|
|
|
97155b |
|
|
|
97155b |
diff -up console-setup/man/ckbcomp.1.orig console-setup/man/ckbcomp.1
|
|
|
97155b |
--- console-setup/man/ckbcomp.1.orig 2012-06-26 13:03:52.177823914 +0200
|
|
|
97155b |
+++ console-setup/man/ckbcomp.1 2012-06-26 14:21:00.460672366 +0200
|
|
|
97155b |
@@ -46,7 +46,7 @@ Print a usage message and exit.
|
|
|
97155b |
.BI -charmap\ charmap
|
|
|
97155b |
The encoding to use for the output keymap. There should be an
|
|
|
97155b |
character mapping table defining this encoding in
|
|
|
97155b |
-.IR /usr/local/share/consoletrans .
|
|
|
97155b |
+.IR /usr/share/consoletrans .
|
|
|
97155b |
Definitions of the following charmaps are provided:
|
|
|
97155b |
.nh
|
|
|
97155b |
.BR ARMSCII-8 ,
|
|
|
97155b |
@@ -86,8 +86,9 @@ for files included by the keymap descrip
|
|
|
97155b |
multiple times. If a file can not be found in any of the specified
|
|
|
97155b |
directories, it will be searched also in some other standard
|
|
|
97155b |
locations, such as
|
|
|
97155b |
-.IR /usr/local/etc/console-setup/ckb ,
|
|
|
97155b |
-.IR /usr/local/share/X11/xkb
|
|
|
97155b |
+.IR /etc/console-setup/ckb ,
|
|
|
97155b |
+.IR /usr/local/share/X11/xkb ,
|
|
|
97155b |
+.IR /usr/share/X11/xkb
|
|
|
97155b |
and
|
|
|
97155b |
.IR /etc/X11/xkb
|
|
|
97155b |
|
|
|
97155b |
@@ -167,9 +168,9 @@ Specifies the layout variant used to cho
|
|
|
97155b |
Adds an option used to choose component names.
|
|
|
97155b |
|
|
|
97155b |
.SH FILES
|
|
|
97155b |
-.I /usr/local/share/consoletrans
|
|
|
97155b |
+.I /usr/share/consoletrans
|
|
|
97155b |
.br
|
|
|
97155b |
-.I /usr/local/etc/console-setup/ckb
|
|
|
97155b |
+.I /etc/console-setup/ckb
|
|
|
97155b |
.br
|
|
|
97155b |
.I /usr/share/X11/xkb
|
|
|
97155b |
.br
|
|
|
97155b |
diff -up console-setup/man/console-setup.5.orig console-setup/man/console-setup.5
|
|
|
97155b |
--- console-setup/man/console-setup.5.orig 2012-06-26 13:10:37.076260103 +0200
|
|
|
97155b |
+++ console-setup/man/console-setup.5 2012-06-26 14:19:44.635215971 +0200
|
|
|
97155b |
@@ -378,16 +378,16 @@ Completely covered by the following font
|
|
|
97155b |
The standard location of the
|
|
|
97155b |
.B console-setup
|
|
|
97155b |
configuration file is
|
|
|
97155b |
-.IR /usr/local/etc/default/console-setup .
|
|
|
97155b |
+.IR /etc/default/console-setup .
|
|
|
97155b |
The keyboard configuration is in
|
|
|
97155b |
-.IR /usr/local/etc/default/keyboard .
|
|
|
97155b |
+.IR /etc/default/keyboard .
|
|
|
97155b |
Fonts that can be used with the variable
|
|
|
97155b |
.B FONT
|
|
|
97155b |
are usually installed in
|
|
|
97155b |
-.IR /usr/share/consolefonts/ " or " /usr/share/syscons/fonts/ .
|
|
|
97155b |
+.IR /usr/share/consolefonts/ " or " /lib/kbd/consolefonts/ .
|
|
|
97155b |
Translation maps that can be used with the variable CONSOLE_MAP are
|
|
|
97155b |
usually installed in
|
|
|
97155b |
-.IR /usr/share/consoletrans/ " or " /usr/share/syscons/scrnmaps/ .
|
|
|
97155b |
+.IR /usr/share/consoletrans/ " or " /lib/kbd/consoletrans/ .
|
|
|
97155b |
|
|
|
97155b |
.SH NOTES
|
|
|
97155b |
The aim of the Terminus font is to reduce the eyes-fatigue when one
|
|
|
97155b |
diff -up console-setup/man/keyboard.5.orig console-setup/man/keyboard.5
|
|
|
97155b |
--- console-setup/man/keyboard.5.orig 2012-06-26 13:09:26.323834480 +0200
|
|
|
97155b |
+++ console-setup/man/keyboard.5 2012-06-26 13:34:33.243901584 +0200
|
|
|
97155b |
@@ -152,12 +152,12 @@ on FreeBSD.
|
|
|
97155b |
The standard location of the
|
|
|
97155b |
.B keyboard
|
|
|
97155b |
file is
|
|
|
97155b |
-.IR /usr/local/etc/default/keyboard .
|
|
|
97155b |
+.IR /etc/default/keyboard .
|
|
|
97155b |
Description of all available keyboard models, layouts, variants and
|
|
|
97155b |
options is available in
|
|
|
97155b |
-.IR /usr/local/share/X11/xkb/rules/xorg.lst .
|
|
|
97155b |
+.IR /usr/share/X11/xkb/rules/xorg.lst .
|
|
|
97155b |
In most cases, in
|
|
|
97155b |
-.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/
|
|
|
97155b |
+.IR /lib/kbd/keymaps/
|
|
|
97155b |
you will find several keymaps that can be used with the variable
|
|
|
97155b |
.BR KMAP .
|
|
|
97155b |
|
|
|
97155b |
diff -up console-setup/man/setupcon.1.orig console-setup/man/setupcon.1
|
|
|
97155b |
--- console-setup/man/setupcon.1.orig 2012-06-26 13:00:14.192512373 +0200
|
|
|
97155b |
+++ console-setup/man/setupcon.1 2012-06-26 13:03:27.247673862 +0200
|
|
|
97155b |
@@ -22,11 +22,11 @@ the console. Most of the time you invok
|
|
|
97155b |
without arguments. The keyboard configuration is specified in
|
|
|
97155b |
.I ~/.keyboard
|
|
|
97155b |
or
|
|
|
97155b |
-.IR /usr/local/etc/default/keyboard .
|
|
|
97155b |
+.IR /etc/default/keyboard .
|
|
|
97155b |
The font configuration is specified in
|
|
|
97155b |
.I ~/.console-setup
|
|
|
97155b |
or
|
|
|
97155b |
-.IR /usr/local/etc/default/console-setup .
|
|
|
97155b |
+.IR /etc/default/console-setup .
|
|
|
97155b |
Consult
|
|
|
97155b |
.BR keyboard (5)
|
|
|
97155b |
and
|
|
|
97155b |
@@ -131,13 +131,13 @@ for the default configuration.
|
|
|
97155b |
.br
|
|
|
97155b |
.I ~/.keyboard
|
|
|
97155b |
.br
|
|
|
97155b |
-.I /usr/local/etc/default/console-setup
|
|
|
97155b |
+.I /etc/default/console-setup
|
|
|
97155b |
.br
|
|
|
97155b |
-.I /usr/local/etc/default/keyboard
|
|
|
97155b |
+.I /etc/default/keyboard
|
|
|
97155b |
.br
|
|
|
97155b |
-.I /usr/local/etc/default/console-setup.VARIANT
|
|
|
97155b |
+.I /etc/default/console-setup.VARIANT
|
|
|
97155b |
.br
|
|
|
97155b |
-.I /usr/local/etc/default/keyboard.VARIANT
|
|
|
97155b |
+.I /etc/default/keyboard.VARIANT
|
|
|
97155b |
.br
|
|
|
97155b |
.I /etc/console-setup/
|
|
|
97155b |
|