From a2ef3b1555aa77badca35d5e9f461e4187478ceb Mon Sep 17 00:00:00 2001
From: Wolfram Schneider <wosch@FreeBSD.org>
Date: Sat, 3 Jan 1998 14:09:21 +0000
Subject: [PATCH] 444 -> ${SHAREMODE} /usr/share -> ${SHAREDIR}

---
 share/syscons/fonts/Makefile    | 6 +++---
 share/syscons/keymaps/Makefile  | 8 ++++----
 share/syscons/scrnmaps/Makefile | 8 +++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index b112ff812da7..e252839bea7d 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.14 1997/04/04 01:44:18 ache Exp $
+# $Id: Makefile,v 1.15 1997/09/22 21:44:38 wosch Exp $
 
 FONTS=	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
 	cp437-thin-8x8.fnt cp437-thin-8x16.fnt \
@@ -16,13 +16,13 @@ FONTS=	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
 	koi8-rb-8x16.fnt koi8-rc-8x16.fnt \
 	INDEX.fonts
 
-FONTDIR = /usr/share/syscons/fonts
+FONTDIR = ${SHAREDIR}/syscons/fonts
 
 NOMAN = noman
 NOOBJ = noobj
 
 install:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FONTS} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FONTS} \
 		${DESTDIR}${FONTDIR}
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index 5d6b1852ccd1..a6f8a24ce845 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 1997/09/22 21:44:53 wosch Exp $
+# $Id: Makefile,v 1.23 1997/11/07 15:55:06 ache Exp $
 
 KEYMAPS=  INDEX.keymaps
 KEYMAPS+= be.iso.kbd
@@ -19,12 +19,12 @@ KEYMAPS+= swissgerman.iso.kbd
 KEYMAPS+= uk.iso.kbd uk.cp850.kbd
 KEYMAPS+= us.iso.kbd us.dvorak.kbd us.dvorakx.kbd
 
-MAPSDIR = /usr/share/syscons/keymaps
+MAPSDIR = ${SHAREDIR}/syscons/keymaps
 NOMAN = noman
 NOOBJ = noobj
 
 install:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${KEYMAPS} \
-			${DESTDIR}${MAPSDIR}
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${KEYMAPS} \
+	    ${DESTDIR}${MAPSDIR}
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index c02fe1806bc6..61e1b57ba0fb 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -1,7 +1,9 @@
+#	$Id$
+
 SCRMAPS = koi8-r2cp866.scm iso-8859-1_to_cp437.scm
 
 SCRMAPS_MK = ${SCRMAPS:R:S/$/.mk/g}
-SCRDIR = /usr/share/syscons/scrnmaps
+SCRDIR = ${SHAREDIR}/syscons/scrnmaps
 CLEANFILES+= ${SCRMAPS_MK} ${SCRMAPS}
 
 NOMAN = noman
@@ -9,8 +11,8 @@ NOMAN = noman
 all: ${SCRMAPS}
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${SCRMAPS} \
-		${DESTDIR}${SCRDIR}
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \
+	    ${SCRMAPS} ${DESTDIR}${SCRDIR}
 
 ${SCRMAPS}: ${.TARGET:R}.mk
 	./${.TARGET:R}.mk ${.TARGET:R}.tmp