1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
--- sys/unix/Makefile.top.orig 1996-12-10 12:20:10.000000000 -0800
+++ sys/unix/Makefile.top 2014-06-28 16:26:54.000000000 -0700
@@ -14,16 +14,16 @@
# MAKE = make
# make NetHack
-GAME = nethack
+GAME = %%HACKNAME%%
GAMEUID = games
-GAMEGRP = bin
+GAMEGRP = games
# Permissions - some places use setgid instead of setuid, for instance
# See also the option "SECURE" in include/config.h
-GAMEPERM = 04755
-FILEPERM = 0644
+GAMEPERM = 02755
+FILEPERM = 0664
EXEPERM = 0755
-DIRPERM = 0755
+DIRPERM = 0775
# GAMEDIR also appears in config.h as "HACKDIR".
#
@@ -32,13 +32,13 @@
# therefore there should not be anything in GAMEDIR that you want to keep
# (if there is, you'll have to do the installation by hand or modify the
# instructions)
-GAMEDIR = /usr/games/lib/$(GAME)dir
-SHELLDIR = /usr/games
+GAMEDIR = ${PREFIX}/share/%%HACKNAME%%
+SHELLDIR = ${PREFIX}/bin
# per discussion in Install.X11
-VARDATND =
+# VARDATND =
# VARDATND = x11tiles pet_mark.xbm
-# VARDATND = x11tiles pet_mark.xbm rip.xpm
+VARDATND = x11tiles pet_mark.xbm rip.xpm
VARDATD = data oracles options quest.dat rumors
VARDAT = $(VARDATD) $(VARDATND)
@@ -74,7 +74,7 @@
$(GAME):
( cd src ; $(MAKE) )
-all: $(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb
+all: $(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
@echo "Done."
Guidebook:
@@ -126,6 +126,8 @@
( cd util ; $(MAKE) dlb )
( cd dat ; ../util/dlb cf nhdat $(DATDLB) )
+recover:
+ ( cd util ; $(MAKE) recover )
dofiles:
target=`sed -n \
@@ -135,66 +137,45 @@
-e '}' \
-e '$$s/.*/nodlb/p' < dat/options` ; \
$(MAKE) dofiles-$${target-nodlb}
- cp src/$(GAME) $(GAMEDIR)
- -rm -f $(SHELLDIR)/$(GAME)
+ cp src/nethack ${DESTDIR}$(GAMEDIR)/$(GAME)
+ cp util/recover ${DESTDIR}$(GAMEDIR)
+ -rm -f ${DESTDIR}$(SHELLDIR)/$(GAME)
sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
< sys/unix/nethack.sh \
- > $(SHELLDIR)/$(GAME)
-# set up their permissions
- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \
- $(CHGRP) $(GAMEGRP) $(GAME) )
- chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
- -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
- $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
- chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
+ > ${DESTDIR}$(SHELLDIR)/$(GAME)
dofiles-dlb: check-dlb
- ( cd dat ; cp nhdat $(DATNODLB) $(GAMEDIR) )
-# set up their permissions
- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
- $(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \
- chmod $(FILEPERM) nhdat $(DATNODLB) )
+ ( cd dat ; cp nhdat $(DATNODLB) ${DESTDIR}$(GAMEDIR) )
dofiles-nodlb:
# copy over the game files
- ( cd dat ; cp $(DAT) $(GAMEDIR) )
-# set up their permissions
- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
- $(CHGRP) $(GAMEGRP) $(DAT) ; \
- chmod $(FILEPERM) $(DAT) )
+ ( cd dat ; cp $(DAT) ${DESTDIR}$(GAMEDIR) )
-update: $(GAME) $(VARDAT) dungeon spec_levs
+update: $(GAME) recover $(VARDAT) dungeon spec_levs
# (don't yank the old version out from under people who're playing it)
- -mv $(GAMEDIR)/$(GAME) $(GAMEDIR)/$(GAME).old
+ -mv ${DESTDIR}$(GAMEDIR)/$(GAME) ${DESTDIR}$(GAMEDIR)/$(GAME).old
# quest.dat is also kept open and has the same problems over NFS
# (quest.dat may be inside nhdat if dlb is in use)
- -mv $(GAMEDIR)/quest.dat $(GAMEDIR)/quest.dat.old
- -mv $(GAMEDIR)/nhdat $(GAMEDIR)/nhdat.old
+ -mv ${DESTDIR}$(GAMEDIR)/quest.dat ${DESTDIR}$(GAMEDIR)/quest.dat.old
+ -mv ${DESTDIR}$(GAMEDIR)/nhdat ${DESTDIR}$(GAMEDIR)/nhdat.old
# set up new versions of the game files
( $(MAKE) dofiles )
# touch time-sensitive files
- -touch -c $(GAMEDIR)/bones* $(GAMEDIR)/?lock* $(GAMEDIR)/wizard*
- -touch -c $(GAMEDIR)/save/*
- touch $(GAMEDIR)/perm $(GAMEDIR)/record
+ -touch -c ${DESTDIR}$(GAMEDIR)/bones* ${DESTDIR}$(GAMEDIR)/?lock* ${DESTDIR}$(GAMEDIR)/wizard*
+ touch ${DESTDIR}$(GAMEDIR)/perm ${DESTDIR}$(GAMEDIR)/record
# and a reminder
@echo You may also want to install the man pages via the doc Makefile.
-install: $(GAME) $(VARDAT) dungeon spec_levs
+install: $(GAME) recover $(VARDAT) dungeon spec_levs
# set up the directories
- -mkdir $(SHELLDIR)
- -rm -rf $(GAMEDIR)
- -mkdir $(GAMEDIR) $(GAMEDIR)/save
- -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(GAMEDIR)/save
- $(CHGRP) $(GAMEGRP) $(GAMEDIR) $(GAMEDIR)/save
- chmod $(DIRPERM) $(GAMEDIR) $(GAMEDIR)/save
+ -mkdir ${DESTDIR}$(SHELLDIR)
+ -rmdir ${DESTDIR}$(GAMEDIR)
+ -mkdir ${DESTDIR}$(GAMEDIR) ${DESTDIR}$(GAMEDIR)
# set up the game files
( $(MAKE) dofiles )
# set up some additional files
- touch $(GAMEDIR)/perm $(GAMEDIR)/record $(GAMEDIR)/logfile
- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
- $(CHGRP) $(GAMEGRP) perm record logfile ; \
- chmod $(FILEPERM) perm record logfile )
+ touch ${DESTDIR}$(GAMEDIR)/perm ${DESTDIR}$(GAMEDIR)/record ${DESTDIR}$(GAMEDIR)/logfile
# and a reminder
@echo You may also want to reinstall the man pages via the doc Makefile.
|
