fix make install; fix the package directory tree

diff --git a/sys/unix/hints/macosx10.10 b/sys/unix/hints/macosx10.10
index 79b2a783fbf0ae3ea65ff7587dad409fabea7d78..deb10f5cbb065c424268fcfcd180f1bafe411cf1 100644 (file)
--- a/sys/unix/hints/macosx10.10
+++ b/sys/unix/hints/macosx10.10
@@ -46,7 +46,7 @@ endif # WANT_WIN_QT
 #         administered this may not be what you (or your admin) want.
 #         Consider a non-shared install (WANT_SHARE_INSTALL=0) instead.
 #      - 'make install' must be run as "sudo make install"    
-#WANT_SHARE_INSTALL=1
+WANT_SHARE_INSTALL=1
 GAMEUID  = $(USER)
 GAMEGRP  = games
 # build to run in the source tree - primarily for development.  Build with "make all"
@@ -143,7 +143,7 @@ GAMEPERM = 02755
 else   # ! root
 PREFIX:=/Users/$(GAMEUID)
 SHELLDIR=$(PREFIX)/bin
-HACKDIR=$(PREFIX)/nethackdir
+HACKDIR=$(PREFIX)/Library/NetHack/nethackdir
 CHOWN=/usr/bin/true
 CHGRP=/usr/bin/true
 GAMEPERM = 0500
@@ -186,6 +186,9 @@ POSTINSTALL+= cp -n sys/unix/sysconf $(HACKDIR)/sysconf; $(CHOWN) $(GAMEUID) $(H
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE
 endif  # !WANT_SOURCE_INSTALL
 
+INSTDIR=$(HACKDIR)
+VARDIR=$(HACKDIR)
+
 
 # ~/Library/Preferences/NetHack Defaults
 # OPTIONS=name:player,number_pad,menustyle:partial,!time,showexp
@@ -211,8 +214,9 @@ PKGR=productbuild
 SVS=$(shell $(NHSROOT)/util/makedefs --svs)
 SVSDOT=$(shell $(NHSROOT)/util/makedefs --svs .)
 
-PKGROOT_UG     = PKGROOT/usr/local/games
-PKGROOT_UGLN   = PKGROOT/usr/local/games/lib/nethackdir
+PKGROOT_UG     = PKGROOT/$(PREFIX)
+PKGROOT_UGLN   = PKGROOT/$(HACKDIR)
+PKGROOT_BIN    = PKGROOT/$(SHELLDIR)
 build_tty_pkg:
 ifneq (,$(WANT_WIN_X11)$(WANT_WIN_QT))
        -echo build_tty_pkg only works for a tty-only build
@@ -251,10 +255,10 @@ else
 build_package_root:
        cd src/..       # make sure we are at TOP
        rm -rf PKGROOT
-       mkdir -p $(PKGROOT_UG)/lib $(PKGROOT_UG)/bin $(PKGROOT_UG)/man/man6 $(PKGROOT_UG)/doc $(PKGROOT_UGLN)
-       install -p src/nethack $(PKGROOT_UG)/bin
+       mkdir -p $(PKGROOT_UG)/lib $(PKGROOT_BIN) $(PKGROOT_UG)/man/man6 $(PKGROOT_UG)/doc $(PKGROOT_UGLN)
+       install -p src/nethack $(PKGROOT_BIN)
        # XXX should this be called nethackrecover?
-       install -p util/recover $(PKGROOT_UG)/bin
+       install -p util/recover $(PKGROOT_BIN)
        install -p doc/nethack.6 $(PKGROOT_UG)/man/man6
        install -p doc/recover.6 $(PKGROOT_UG)/man/man6
        install -p doc/Guidebook $(PKGROOT_UG)/doc

diff --git a/win/macosx/NetHackGuidebook.applescript b/win/macosx/NetHackGuidebook.applescript
index cc41a59170298912dbbcbd26a099903fb2cebaf9..04260d9ff1d10d65ec67dfa0584b261857bfdefe 100644 (file)
--- a/win/macosx/NetHackGuidebook.applescript
+++ b/win/macosx/NetHackGuidebook.applescript
@@ -6,6 +6,6 @@
 # Display the Guidebook from the GUI.
 
 tell application "Finder"
-        open location "file:///usr/local/games/doc/NetHackGuidebook.pdf"
+        open location "file:///Library/Nethack/doc/NetHackGuidebook.pdf"
         delay 5
 end tell

diff --git a/win/macosx/NetHackRecover.applescript b/win/macosx/NetHackRecover.applescript
index 04a5caf5599dee738e5244ab7d024b4afb5839a9..31c518eb3002883b4aadb6b5596bbac2a893b1b7 100644 (file)
--- a/win/macosx/NetHackRecover.applescript
+++ b/win/macosx/NetHackRecover.applescript
@@ -19,7 +19,7 @@ if not canceled then
                --set lastpos to lastpos + (length of "/nethackdir")
                --set rawpath to (get text 1 through lastpos of mpath) & "/recover.pl"
                --set safepath to the quoted form of rawpath
-               set safepath to the quoted form of "/usr/local/games/lib/nethackdir/recover.pl"
+               set safepath to the quoted form of "/Library/Nethack/nethackdir/recover.pl"
        end considering
        do shell script safepath
        display dialog result with title "NetHackRecover Output"

diff --git a/win/macosx/NetHackTerm.applescript b/win/macosx/NetHackTerm.applescript
index 852394a9415063079d2a11c8f356c9918d8ed710..127b2c2defa82bd18e417ca1219cefafbbeadc32 100644 (file)
--- a/win/macosx/NetHackTerm.applescript
+++ b/win/macosx/NetHackTerm.applescript
@@ -21,7 +21,7 @@ tell application "Terminal"
        
        activate
        #open new window and run NetHack in it
-       do script with command "clear;sleep 1;/usr/local/games/bin/nethack;echo '(press RETURN to exit)';awk '{exit}';exit"
+       do script with command "clear;sleep 1;/usr/local/bin/nethack;echo '(press RETURN to exit)';awk '{exit}';exit"
        set nhresult to result -- class is tab
        set nhresrec to result as record
        set nhreslist to result as list

diff --git a/win/macosx/recover.pl b/win/macosx/recover.pl
index cd29033006b808d4a379426ddd89d9ce4f922095..e14aafb146466dcf2df3d27734be8d0b255877d7 100755 (executable)
--- a/win/macosx/recover.pl
+++ b/win/macosx/recover.pl
@@ -39,7 +39,7 @@ if($try_perm){
 
 # run recover, but only if there is something that looks promising
 $recover = "./recover";
-$recover = "/usr/local/games/bin/recover" unless(-e $recover);
+$recover = "/usr/local/bin/recover" unless(-e $recover);
 
 $uid = $<;
 foreach ( <$uid*.0> ){