From d454ca0d6e34cea9e7a1fa32e4cd92b3cf3da8e0 Mon Sep 17 00:00:00 2001
From: keni <keni>
Date: Mon, 17 Dec 2007 22:39:15 +0000
Subject: [PATCH] hints cleanup tids (trunk only)

---
 Files                     |  8 ++++++--
 sys/unix/hints/macosx     |  6 +++---
 sys/unix/hints/macosx-x11 | 12 ++++++------
 sys/unix/hints/unix       |  3 ++-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Files b/Files
index 8d3334aff..38799b72d 100644
--- a/Files
+++ b/Files
@@ -161,13 +161,17 @@ wdnflute.uu     wdnharp.uu
 sys/unix:
 (files for UNIX versions)
 Install.unx     Makefile.dat    Makefile.doc    Makefile.src    Makefile.top
-Makefile.utl    README.linux    depend.awk      nethack.sh      setup.sh
-unixmain.c      unixres.c       unixunix.c
+Makefile.utl    README.linux    depend.awk      mkmkfile.sh     nethack.sh
+setup.sh        unixmain.c      unixres.c       unixunix.c
 (files for replacement cpp, apparently only needed by some UNIX systems)
 cpp1.shr        cpp2.shr        cpp3.shr
 (file for sound driver for 386 UNIX)
 snd86unx.shr
 
+sys/unix/hints:
+(files for configuring UNIX NetHack versions)
+linux           linux-x11       macosx          macos-x11       unix
+
 sys/vms:
 (files for VMS version)
 Install.vms     Makefile.dat    Makefile.doc    Makefile.src    Makefile.top
diff --git a/sys/unix/hints/macosx b/sys/unix/hints/macosx
index 95defc3bc..84eebceeb 100644
--- a/sys/unix/hints/macosx
+++ b/sys/unix/hints/macosx
@@ -11,9 +11,9 @@
 
 # This is a tty build for a single user.
 
-# XXX temp testing:
-HACKDIR=/tmp/nhdir5
-PREFIX=/tmp
+PREFIX:=$(wildcard ~)
+SHELLDIR=$(PREFIX)/bin
+HACKDIR=$(PREFIX)/nethackdir
 
 CC=gcc -W -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -DGCC_WARN
 
diff --git a/sys/unix/hints/macosx-x11 b/sys/unix/hints/macosx-x11
index 5e4c8880c..04e7b7ba7 100644
--- a/sys/unix/hints/macosx-x11
+++ b/sys/unix/hints/macosx-x11
@@ -9,9 +9,11 @@
 # don't change this one.
 # Useful info: http://www.opensource.apple.com/darwinsource/index.html
 
-# XXX temp testing:
-HACKDIR=/tmp/nhdir5
-PREFIX=/tmp
+# This is an X11 build for a single user.
+
+PREFIX:=$(wildcard ~)
+SHELLDIR=$(PREFIX)/bin
+HACKDIR=$(PREFIX)/nethackdir
 
 #HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
 #PREFIX=/usr
@@ -24,8 +26,6 @@ CFLAGS2=-DNOCLIPPING -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\"
 CFLAGS3=-DX11_GRAPHICS -DDEFAULT_WINDOW_SYS=\"X11\" -DNOTTYGRAPHICS
 LFLAGS=-L/usr/X11R6/lib
 
-#WINTTYLIB=-lncurses
-
 CHOWN=true
 CHGRP=true
 
@@ -35,6 +35,6 @@ WINLIB = $(WINX11LIB)
 
 VARDATND = x11tiles NetHack.ad pet_mark.xbm
 
-# XXX install nethack.rc as .nethackrc
+# XXX install nethack.rc as ~/.nethackrc if no ~/.nethackrc exists
 
 POSTINSTALL= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir)
diff --git a/sys/unix/hints/unix b/sys/unix/hints/unix
index 5ae522833..39018c548 100644
--- a/sys/unix/hints/unix
+++ b/sys/unix/hints/unix
@@ -9,8 +9,9 @@
 # and Makefiles.
 
 
-HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
 PREFIX=/usr
+HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
+SHELLDIR=$(PREFIX)/games
 
 CFLAGS=-O -I../include