author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Mon, 27 Oct 2014 23:00:40 -0700 | |
changeset 2178 | e3d4058f48f8 |
parent 1702 | 3667926c2ec4 |
permissions | -rw-r--r-- |
301
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
--- include/config.h.old Sun Dec 7 15:39:13 2003 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
+++ include/config.h Sun Mar 30 12:37:01 2008 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
@@ -43,7 +43,7 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
* Some combinations make no sense. See the installation document. |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
*/ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
#define TTY_GRAPHICS /* good old tty based graphics */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
-/* #define X11_GRAPHICS */ /* X11 interface */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
+#define X11_GRAPHICS /* X11 interface */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
/* #define QT_GRAPHICS */ /* Qt interface */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
/* #define GNOME_GRAPHICS */ /* Gnome interface */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
/* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
@@ -126,7 +126,7 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
* would allow: |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
* xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
*/ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
-/* # define USE_XPM */ /* Disable if you do not have the XPM library */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
+# define USE_XPM /* Disable if you do not have the XPM library */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
# ifdef USE_XPM |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
# define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
# endif |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
@@ -169,11 +169,11 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
#ifdef UNIX |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
/* path and file name extension for compression program */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
-#define COMPRESS_EXTENSION ".Z" /* compress's extension */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
+/* #define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
+/* #define COMPRESS_EXTENSION ".Z" /* compress's extension */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
/* An example of one alternative you might want to use: */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
-/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
-/* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
+#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
+#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
#endif |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
#ifndef COMPRESS |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
37 |
@@ -204,7 +204,7 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
38 |
* otherwise it will be the current directory. |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
39 |
*/ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
40 |
# ifndef HACKDIR |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
41 |
-# define HACKDIR "/usr/games/lib/nethackdir" |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
42 |
+# define HACKDIR "/usr/lib/nethack" |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
43 |
# endif |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
44 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
45 |
/* |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
46 |
@@ -300,7 +300,7 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
47 |
* functions that have been macroized. |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
48 |
*/ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
49 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
50 |
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
51 |
+#define VISION_TABLES 1 /* use vision tables generated at compile time */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
52 |
#ifndef VISION_TABLES |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
53 |
# ifndef NO_MACRO_CPATH |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
54 |
# define MACRO_CPATH /* use clear_path macros instead of functions */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
55 |
--- include/unixconf.h.old 2003-12-07 15:39:13.000000000 -0800 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
56 |
+++ include/unixconf.h 2007-09-27 09:12:36.692549857 -0700 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
57 |
@@ -96,13 +96,13 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
58 |
*/ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
59 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
60 |
/* #define NO_FILE_LINKS */ /* if no hard links */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
61 |
-/* #define LOCKDIR "/usr/games/lib/nethackdir" */ /* where to put locks */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
62 |
+#define LOCKDIR "/var/games/nethack" /* where to put locks */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
63 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
64 |
/* |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
65 |
* If you want the static parts of your playground on a read-only file |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
66 |
* system, define VAR_PLAYGROUND to be where the variable parts are kept. |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
67 |
*/ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
68 |
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
69 |
+#define VAR_PLAYGROUND "/var/games/nethack" |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
70 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
71 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
72 |
/* |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
73 |
@@ -132,7 +132,7 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
74 |
* "extra output" method is used, but not all systems provide access to |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
75 |
* a fine-grained timer. |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
76 |
*/ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
77 |
-/* #define TIMED_DELAY */ /* usleep() */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
78 |
+#define TIMED_DELAY 1 /* usleep() */ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
79 |
#endif |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
80 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
81 |
/* |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
82 |
--- sys/unix/Makefile.src.old Sun Dec 7 15:39:13 2003 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
83 |
+++ sys/unix/Makefile.src Sun Mar 30 12:38:36 2008 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
84 |
@@ -214,8 +214,8 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
85 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
86 |
# |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
87 |
# |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
88 |
-WINSRC = $(WINTTYSRC) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
89 |
-WINOBJ = $(WINTTYOBJ) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
90 |
+WINSRC = $(WINTTYSRC) $(WINX11SRC) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
91 |
+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
92 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
93 |
# on some systems the termcap library is in -ltermcap or -lcurses |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
94 |
# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
95 |
@@ -235,7 +235,7 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
96 |
# |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
97 |
# libraries for X11 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
98 |
# If USE_XPM is defined in config.h, you will also need -lXpm here. |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
99 |
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 |
1702
3667926c2ec4
18156472 nethack fails to build on 40
Craig Mohrman <craig.mohrman@oracle.com>
parents:
301
diff
changeset
|
100 |
+WINX11LIB = -lXaw -lXext -lXt -lX11 -lXpm |
301
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
101 |
# WINX11LIB = -lXaw -lXmu -lXt -lX11 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
102 |
# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
103 |
# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
104 |
@@ -255,7 +255,7 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
105 |
# libraries for BeOS |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
106 |
WINBELIB = -lbe |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
107 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
108 |
-WINLIB = $(WINTTYLIB) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
109 |
+WINLIB = -Wl,-zignore $(WINTTYLIB) $(WINX11LIB) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
110 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
111 |
# any other strange libraries your system needs (for Sysunix only -- the more |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
112 |
# specialized targets should already be right) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
113 |
--- sys/unix/Makefile.top.old Sun Dec 7 15:39:13 2003 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
114 |
+++ sys/unix/Makefile.top Sun Mar 30 12:42:20 2008 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
115 |
@@ -22,7 +22,7 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
116 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
117 |
# Permissions - some places use setgid instead of setuid, for instance |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
118 |
# See also the option "SECURE" in include/config.h |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
119 |
-GAMEPERM = 04755 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
120 |
+GAMEPERM = 02755 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
121 |
FILEPERM = 0644 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
122 |
EXEPERM = 0755 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
123 |
DIRPERM = 0755 |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
124 |
@@ -35,14 +35,15 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
125 |
# therefore there should not be anything in GAMEDIR that you want to keep |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
126 |
# (if there is, you'll have to do the installation by hand or modify the |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
127 |
# instructions) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
128 |
-GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
129 |
-VARDIR = $(GAMEDIR) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
130 |
-SHELLDIR = $(PREFIX)/games |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
131 |
+GAMEDIR = $(ROOT)/$(PREFIX)/lib/$(GAME) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
132 |
+CLIENT_GAMEDIR = $(PREFIX)/lib/$(GAME) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
133 |
+VARDIR = $(ROOT)/var/games/nethack |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
134 |
+SHELLDIR = $(ROOT)/$(PREFIX)/bin |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
135 |
|
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
136 |
# per discussion in Install.X11 and Install.Qt |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
137 |
VARDATND = |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
138 |
# VARDATND = x11tiles NetHack.ad pet_mark.xbm |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
139 |
-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
140 |
+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
141 |
# for Atari/Gem |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
142 |
# VARDATND = nh16.img title.img GEM_RSC.RSC rip.img |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
143 |
# for BeOS |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
144 |
@@ -186,7 +187,7 @@ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
145 |
cp src/$(GAME) $(GAMEDIR) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
146 |
cp util/recover $(GAMEDIR) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
147 |
-rm -f $(SHELLDIR)/$(GAME) |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
148 |
- sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
149 |
+ sed -e 's;/usr/games/lib/nethackdir;$(CLIENT_GAMEDIR);' \ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
150 |
-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
151 |
< sys/unix/nethack.sh \ |
ab9eef4f4029
7054109 Move nethack to userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
152 |
> $(SHELLDIR)/$(GAME) |