patch-sys_unix_Makefile_top 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. $OpenBSD: patch-sys_unix_Makefile_top,v 1.6 2004/08/11 10:15:07 espie Exp $
  2. --- sys/unix/Makefile.top.orig Mon Dec 8 00:39:13 2003
  3. +++ sys/unix/Makefile.top Tue Aug 10 13:37:18 2004
  4. @@ -13,19 +13,19 @@
  5. # execute things like 'data' and 'rumors')
  6. # MAKE = make
  7. +include ${NETHACKCONFIG}
  8. +
  9. # make NetHack
  10. -PREFIX = /usr
  11. GAME = nethack
  12. -# GAME = nethack.prg
  13. -GAMEUID = games
  14. -GAMEGRP = bin
  15. +GAMEUID = bin
  16. +GAMEGRP = games
  17. # Permissions - some places use setgid instead of setuid, for instance
  18. # See also the option "SECURE" in include/config.h
  19. -GAMEPERM = 04755
  20. -FILEPERM = 0644
  21. +GAMEPERM = 02755
  22. +FILEPERM = 0664
  23. EXEPERM = 0755
  24. -DIRPERM = 0755
  25. +DIRPERM = 0775
  26. # GAMEDIR also appears in config.h as "HACKDIR".
  27. # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
  28. @@ -35,12 +35,13 @@ DIRPERM = 0755
  29. # therefore there should not be anything in GAMEDIR that you want to keep
  30. # (if there is, you'll have to do the installation by hand or modify the
  31. # instructions)
  32. -GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir
  33. +REALGAMEDIR = $(NHDIR)
  34. +GAMEDIR = $(DESTDIR)${REALGAMEDIR}
  35. VARDIR = $(GAMEDIR)
  36. -SHELLDIR = $(PREFIX)/games
  37. +SHELLDIR = ${DESTDIR}$(PREFIX)/bin
  38. # per discussion in Install.X11 and Install.Qt
  39. -VARDATND =
  40. +# VARDATND =
  41. # VARDATND = x11tiles NetHack.ad pet_mark.xbm
  42. # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
  43. # for Atari/Gem
  44. @@ -186,7 +187,7 @@ dofiles:
  45. cp src/$(GAME) $(GAMEDIR)
  46. cp util/recover $(GAMEDIR)
  47. -rm -f $(SHELLDIR)/$(GAME)
  48. - sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
  49. + sed -e 's;/usr/games/lib/nethackdir;$(REALGAMEDIR);' \
  50. -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
  51. < sys/unix/nethack.sh \
  52. > $(SHELLDIR)/$(GAME)