From e828de0c412698e656f775546096622ed289ec26 Mon Sep 17 00:00:00 2001
From: cebix <>
Date: Sun, 3 Oct 1999 16:20:08 +0000
Subject: [PATCH] - renamed basilisk_ii_keycodes to keycodes - default location
 of keycodes file is now $(sharedir)/keycodes   (depends on install prefix) -
 improved the install target

---
 BasiliskII/src/Unix/Makefile.in               | 28 ++++++++++---------
 .../Unix/{basilisk_ii_keycodes => keycodes}   |  2 +-
 BasiliskII/src/Unix/video_x.cpp               |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)
 rename BasiliskII/src/Unix/{basilisk_ii_keycodes => keycodes} (99%)

diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in
index f9009b3c..3b223274 100644
--- a/BasiliskII/src/Unix/Makefile.in
+++ b/BasiliskII/src/Unix/Makefile.in
@@ -2,25 +2,27 @@
 
 ## System specific configuration
 @SET_MAKE@
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=$(exec_prefix)/bin
+sharedir=$(prefix)/share/BasiliskII
+mandir=$(prefix)/man
+docdir=$(prefix)/doc/BasiliskII
+
 CC = @CC@
 CXX = @CXX@
 CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@ -I../include -I. @CPUINCLUDES@
-DEFS = @DEFS@ @DEFINES@ -D_REENTRANT
+DEFS = @DEFS@ @DEFINES@ -D_REENTRANT -DSHAREDIR=\"$(sharedir)\"
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 SYSSRCS = @SYSSRCS@
 CPUSRCS = @CPUSRCS@
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=$(exec_prefix)/bin
-libdir=$(exec_prefix)/lib
-mandir=$(prefix)/man
-INSTALL=@INSTALL@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@
-INSTALL_DATA=@INSTALL_DATA@
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_DATA = @INSTALL_DATA@
 
 ## Files
 SRCS=../prefs.cpp ../rom_patches.cpp ../slot_rom.cpp ../rsrc_patches.cpp ../emul_op.cpp \
@@ -57,9 +59,9 @@ modules:
 	cd Linux/NetDriver; make
 
 install: $(APP)
-	$(INSTALL_PROGRAM) -s BasiliskII $(bindir)
-	$(INSTALL_DATA) BasiliskII.1 $(mandir)/man1/
-	$(INSTALL_DATA) basilisk_ii_keycodes $(libdir)
+	$(INSTALL_PROGRAM) BasiliskII $(bindir)
+	$(INSTALL_DATA) BasiliskII.1 $(mandir)/man1
+	$(INSTALL_DATA) keycodes $(sharedir)
 
 clean:
 	-rm -f $(OBJ_DIR)/* core* *.core *~ *.bak
diff --git a/BasiliskII/src/Unix/basilisk_ii_keycodes b/BasiliskII/src/Unix/keycodes
similarity index 99%
rename from BasiliskII/src/Unix/basilisk_ii_keycodes
rename to BasiliskII/src/Unix/keycodes
index abce0d52..17e1d44c 100644
--- a/BasiliskII/src/Unix/basilisk_ii_keycodes
+++ b/BasiliskII/src/Unix/keycodes
@@ -1,4 +1,4 @@
-# /usr/local/lib/basilisk_ii_keycodes
+# /usr/share/BasiliskII/keycodes
 #
 # Basilisk II (C) 1997-1999 Christian Bauer
 #
diff --git a/BasiliskII/src/Unix/video_x.cpp b/BasiliskII/src/Unix/video_x.cpp
index 04ff6534..36c25ae3 100644
--- a/BasiliskII/src/Unix/video_x.cpp
+++ b/BasiliskII/src/Unix/video_x.cpp
@@ -61,7 +61,7 @@ enum {
 
 
 // Constants
-const char KEYCODE_FILE_NAME[] = "/usr/local/lib/basilisk_ii_keycodes";
+const char KEYCODE_FILE_NAME[] = SHAREDIR "keycodes";
 
 
 // Global variables