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
|
From: Stefan Ritter <xeno@thehappy.de>
Subject: Fixes to make it debian compatible
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -20,7 +20,7 @@
# Use the "cat" GUIDECMD if nroff and/or tbl and/or col are not installed
# GUIDECMD = cat Guidebook.txt
-GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
+GUIDECMD = tbl tmac.n Guidebook.mn | nroff -Tascii | $(COLCMD)
# the basic guidebook
Guidebook: Guidebook.mn
@@ -38,7 +38,7 @@
GAME = nethack
-MANDIR = /usr/man/man6
+MANDIR = $(DESTDIR)$(PREFIX)/share/man/man$(MANEXT)
MANEXT = 6
# manual installation for most BSD-style systems
@@ -68,17 +68,17 @@
@echo "Plain text documentation is up to date."
Guidebook.txt : Guidebook.mn tmac.n
- tbl tmac.n Guidebook.mn | nroff | $(COLCMD) > Guidebook.txt
+ tbl tmac.n Guidebook.mn | nroff -Tascii | $(COLCMD) > Guidebook.txt
nethack.txt : nethack.6
- nroff -man nethack.6 | $(COLCMD) > nethack.txt
+ nroff -Tascii -man nethack.6 | $(COLCMD) > nethack.txt
lev_comp.txt : lev_comp.6
- nroff -man lev_comp.6 | $(COLCMD) > lev_comp.txt
+ nroff -Tascii -man lev_comp.6 | $(COLCMD) > lev_comp.txt
dgn_comp.txt : dgn_comp.6
- nroff -man dgn_comp.6 | $(COLCMD) > dgn_comp.txt
+ nroff -Tascii -man dgn_comp.6 | $(COLCMD) > dgn_comp.txt
recover.txt : recover.6
- nroff -man recover.6 | $(COLCMD) > recover.txt
+ nroff -Tascii -man recover.6 | $(COLCMD) > recover.txt
dlb.txt : dlb.6
- nroff -man dlb.6 | $(COLCMD) > dlb.txt
+ nroff -Tascii -man dlb.6 | $(COLCMD) > dlb.txt
clean:
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
# MAKE = make
# make NetHack
-PREFIX = /usr
+PREFIX = $(DESTDIR)/usr
GAME = glhack
# GAME = glhack.prg
GAMEUID = root
@@ -38,8 +38,8 @@
# (if there is, you'll have to do the installation by hand or modify the
# instructions)
GAMEDIR = $(PREFIX)/lib/games/$(GAME)
-VARDIR = /var/lib/games/glhack
-SHELLDIR = $(PREFIX)/bin
+VARDIR = $(DESTDIR)/var/games/$(GAME)
+SHELLDIR = $(PREFIX)/games
MANDIR = $(PREFIX)/share/man
# per discussion in Install.X11 and Install.Qt
@@ -54,10 +54,7 @@
# for GL
VARDATND =
-DATGL = glfont8.png glfont14.png glfont20.png glfont22.png \
- gltile16.png gltile32.png gltile64.png \
- gllogo.png glrip.png \
- glface16.lst glface32.lst
+DATGL = glface16.lst glface32.lst
VARDATD = data oracles options quest.dat rumors
VARDAT = $(VARDATD) $(VARDATND)
@@ -89,7 +86,7 @@
astral.lev air.lev earth.lev fire.lev water.lev
QUEST_LEVS = ???-goal.lev ???-fil?.lev ???-loca.lev ???-strt.lev
-DATNODLB = $(VARDATND) license
+DATNODLB = $(VARDATND)
# GL Hack
DATNODLB += $(DATGL)
@@ -202,11 +199,13 @@
cp util/recover_glhack $(GAMEDIR)
-rm -f $(SHELLDIR)/$(GAME)
# [AJA] remove any old glhack binary (location changed in 1.2)
- -rm -f $(PREFIX)/games/$(GAME)
- sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
- -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
- < win/gl/glhack.sh \
- > $(SHELLDIR)/$(GAME)
+# -rm -f $(PREFIX)/games/$(GAME)
+# sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
+# -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
+# < win/gl/glhack.sh \
+# > $(SHELLDIR)/$(GAME)
+ cp win/gl/glhack.sh $(SHELLDIR)/$(GAME)
+
# set up their permissions
-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover_glhack ; \
$(CHGRP) $(GAMEGRP) $(GAME) recover_glhack )
|
