diff -ru heirloom-070715.orig/build/mk.config heirloom-070715/build/mk.config --- heirloom-070715.orig/build/mk.config 2007-07-15 09:36:59.000000000 -0400 +++ heirloom-070715/build/mk.config 2010-12-16 18:37:43.923333340 -0430 @@ -1,3 +1,5 @@ +PREFIX = /usr/heirloom + # # This is the shell used for the compilation phase, the execution of most # installed scripts, and the shell escapes in the traditional command @@ -6,7 +8,7 @@ # Bourne shell is recommended. It then must obviously be compiled and # installed first. # -SHELL = /sbin/sh +SHELL = $(DEFBIN)/sh # # Specify the path name for a POSIX-conforming shell here. For example, @@ -25,33 +27,33 @@ # Location for binaries that have no special personality. This location # may be identical to that of one of the first three personalities below. # -DEFBIN = /usr/5bin +DEFBIN = $(PREFIX)/bin # # Location for SVID3/SVR4-style binaries. # -SV3BIN = /usr/5bin +SV3BIN = $(DEFBIN) # # Location for SVID4/SVR4.2-style binaries. # -S42BIN = /usr/5bin/s42 +S42BIN = $(DEFBIN)/s42 # # Location for POSIX.2/SUS-style binaries. # -SUSBIN = /usr/5bin/posix +SUSBIN = $(DEFBIN)/posix # # Location for POSIX.1-2001/SUSv3-style binaries. -SU3BIN = /usr/5bin/posix2001 +SU3BIN = $(DEFBIN)/posix2001 # # Location for SVR4 UCB-style binaries. These do not form a complete # personality, and the binary path must not be identical to the default # one. # -UCBBIN = /usr/ucb +UCBBIN = $(DEFBIN)/ucb # # Location for development binaries. The "tsort" utility is @@ -59,23 +61,28 @@ # "Heirloom Development Tools" package are expected to be # installed in it. # -CCSBIN = /usr/ccs/bin +CCSBIN = $(DEFBIN) + +# +# Shell for man scripts. +# +MANSH = /bin/bash # # Location for library files. # -DEFLIB = /usr/5lib +DEFLIB = $(PREFIX)/lib # # Location for superuser-only binaries. May be identical to the # default binary directory. # -DEFSBIN = /usr/5bin +DEFSBIN = $(DEFBIN) # # Location for manual pages (with man1, man1b ... man8 below). # -MANDIR = /usr/share/man/5man +MANDIR = $(PREFIX)/share/man # # Location for default files. Make sure that this directory is accessible @@ -87,7 +94,7 @@ # Location for the spell history file (contains misspelled words for # all users; set to /dev/null to disable). # -SPELLHIST = /var/adm/spellhist +SPELLHIST = /var/cache/spellhist # # Location for the su logfile. @@ -108,7 +115,7 @@ # # On HP-UX, AIX, FreeBSD, NetBSD, and OpenBSD, this setting is not used. # -TTYGRP = -g utmp +#TTYGRP = -g utmp # # Curses library. Change to -lncurses if necessary. Caution: Some gcc