4927b9e25f
As noticed by grunk@
74 lines
2.2 KiB
Plaintext
74 lines
2.2 KiB
Plaintext
$OpenBSD: patch-sys_unix_Makefile_top,v 1.2 2008/01/26 19:07:40 espie Exp $
|
|
--- sys/unix/Makefile.top.orig Sun Dec 30 13:56:29 2007
|
|
+++ sys/unix/Makefile.top Sun Dec 30 14:15:13 2007
|
|
@@ -13,17 +13,19 @@
|
|
# execute things like 'data' and 'rumors')
|
|
# MAKE = make
|
|
|
|
-# make NetHack
|
|
-GAME = nethack
|
|
-GAMEUID = games
|
|
-GAMEGRP = bin
|
|
+include ${NETHACKCONFIG}
|
|
|
|
+# this is slash
|
|
+GAME = slash
|
|
+GAMEUID = 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,11 +34,12 @@ DIRPERM = 0755
|
|
# 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
|
|
+REALGAMEDIR = ${PREFIX}/lib/$(GAME)dir
|
|
+GAMEDIR = ${DESTDIR}${REALGAMEDIR}
|
|
+SHELLDIR = ${DESTDIR}${PREFIX}/bin
|
|
|
|
# per discussion in Install.X11
|
|
-VARDATND =
|
|
+# VARDATND =
|
|
# VARDATND = x11tiles pet_mark.xbm
|
|
# VARDATND = x11tiles pet_mark.xbm rip.xpm
|
|
|
|
@@ -63,7 +66,7 @@ DATHELP = help hh cmdhelp history opthelp wizhelp
|
|
|
|
SPEC_LEVS = *.lev
|
|
|
|
-SPEC_LEVS = asmodeus.lev baalz.lev beholder.lev bigrm-?.lev castle.lev \
|
|
+SPEC_LEVS = asmodeus.lev baalz.lev beholder.lev bigrm-?.lev blkmar.lev castle.lev \
|
|
cav2fill.lev cavefill.lev demogorg.lev dispater.lev dragons.lev \
|
|
fakewiz?.lev geryon.lev guild.lev juiblex.lev knox.lev kobold-?.lev \
|
|
lich.lev mall-?.lev mall.lev medusa-?.lev mine_end.lev minefill.lev \
|
|
@@ -80,7 +83,7 @@ DAT = $(DATNODLB) $(DATDLB)
|
|
$(GAME):
|
|
( cd src ; $(MAKE) )
|
|
|
|
-all: $(GAME) Guidebook $(VARDAT) dungeon spec_levs check-dlb
|
|
+all: $(GAME) .WAIT Guidebook $(VARDAT) dungeon spec_levs check-dlb
|
|
@echo "Done."
|
|
|
|
Guidebook:
|
|
@@ -143,7 +146,7 @@ dofiles:
|
|
$(MAKE) dofiles-$${target-nodlb}
|
|
cp src/$(GAME) $(GAMEDIR)
|
|
-rm -f $(SHELLDIR)/$(GAME)
|
|
- sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
|
|
+ sed -e 's;/usr/games/lib/nethackdir;$(REALGAMEDIR);' \
|
|
-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
|
|
< sys/unix/nethack.sh \
|
|
> $(SHELLDIR)/$(GAME)
|