Use PREFIX now

diff --git a/Makefile b/Makefile
index 668faf48210b131ebe871a6060c1cb7ae24f5ea4..b3c9d43e93ccded2387fe1a9bd90c556f65a7695 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,24 @@ SUBDIR=      adventure arithmetic atc \
        wargames warp worm worms wtf wump
 TOPTARGETS= all clean install
 
+PREFIX        ?= /usr
+LOCALSTATEDIR ?= /var
+SYSCONFDIR    ?= /etc
+ROOT          := $(shell pwd)
+
+export ROOT PREFIX LOCALSTATEDIR SYSCONFDIR
+
 $(TOPTARGETS): $(SUBDIR)
 
-$(SUBDIR):
-       $(MAKE) -C $@ $(MAKECMDGOALS)
+$(SUBDIR): config.h
+       +$(MAKE) -C $@ $(MAKECMDGOALS)
+
+config.h:
+       @echo "#define PREFIX \"$(PREFIX)\"" > config.h
+       @echo "#define LOCALSTATEDIR \"$(LOCALSTATEDIR)\"" >> config.h
+       @echo "#define SYSCONFDIR \"$(SYSCONFDIR)\"" >> config.h
+
+clean:
+       rm -f config.h
 
 .PHONY: $(TOPTARGETS) $(SUBDIR)

diff --git a/adventure/Makefile b/adventure/Makefile
index 83bc8dd79b0deade1201fcf42f5e42c44eddc6af..b656970b25cfc255c733196639e891ae7e52b9f8 100644 (file)
--- a/adventure/Makefile
+++ b/adventure/Makefile
@@ -19,8 +19,8 @@ mkdata: setup.c
        clang -o mkdata setup.c
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/arithmetic/Makefile b/arithmetic/Makefile
index 133c18504dc906bb12a286f9a4d95e1673a8852a..0dfaea85847c40cdf23a015680f2dea68942fffd 100644 (file)
--- a/arithmetic/Makefile
+++ b/arithmetic/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/atc/Makefile b/atc/Makefile
index 22216a34e93303d9a1122eef6398d852f82f7cf7..437fdc54274a2da1c31fb7c52d4da712d0d59f3c 100644 (file)
--- a/atc/Makefile
+++ b/atc/Makefile
@@ -6,7 +6,7 @@ SRCS=   extern.c graphics.c input.c list.c log.c \
        main.c tunable.c update.c
 MAN=   atc.6
 FILES=${GAMES:S@^@${.CURDIR}/games/@g}
-FILESDIR=/usr/share/games/atc
+FILESDIR=$(PREFIX)/share/games/atc
 FILESMODE=644
 
 all: $(PROG)
@@ -14,16 +14,16 @@ all: $(PROG)
 $(PROG): $(SRCS) grammar.y lex.l
        yacc -d grammar.y -o grammar.c
        lex lex.l
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) grammar.c lex.yy.c -lncursesw $(LIBFLA)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) grammar.c lex.yy.c -lncursesw $(LIBFLA) -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       mkdir -p $(DESTDIR)/usr/share/games
-       cp -r games $(DESTDIR)/usr/share/games/atc
-       chmod -R 644 $(DESTDIR)/usr/share/games/atc/*
-       mkdir -p $(DESTDIR)/var/games/
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       mkdir -p $(DESTDIR)/$(PREFIX)/share/games
+       cp -r games $(DESTDIR)/$(PREFIX)/share/games/atc
+       chmod -R 644 $(DESTDIR)/$(PREFIX)/share/games/atc/*
+       mkdir -p $(DESTDIR)/$(LOCALSTATEDIR)/games/
 
 
 clean:

diff --git a/atc/pathnames.h b/atc/pathnames.h
index 742b8fd7928e23718322edcd4a61403a93393f56..d73f6ff65192b5f813308a0b537d7b2c5c3bfd8c 100644 (file)
--- a/atc/pathnames.h
+++ b/atc/pathnames.h
@@ -33,5 +33,7 @@
 
 #include <paths.h>
 
-#define        _PATH_GAMES     "/usr/share/games/atc/"
-#define        _PATH_SCORE     "/var/games/atc_score"
+#include "config.h"
+
+#define        _PATH_GAMES     PREFIX"/share/games/atc/"
+#define        _PATH_SCORE     LOCALSTATEDIR"/games/atc_score"

diff --git a/backgammon/backgammon/Makefile b/backgammon/backgammon/Makefile
index 7e0336f75b934a7210aa9b6793b7be0574e0b5ac..b9a4c10f59a09f0c09a80dc926a5bfa3af96b0f5 100644 (file)
--- a/backgammon/backgammon/Makefile
+++ b/backgammon/backgammon/Makefile
@@ -22,8 +22,8 @@ $(PROG): $(SRCS) $(COMMONOBJS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/backgammon/teachgammon/Makefile b/backgammon/teachgammon/Makefile
index c8666a1d1414ede8952bf7dcdbdc86a221f565cf..69c23965539691c22905594c6fe33e14fa709cf8 100644 (file)
--- a/backgammon/teachgammon/Makefile
+++ b/backgammon/teachgammon/Makefile
@@ -21,7 +21,7 @@ $(PROG): $(SRCS) $(COMMONOBJS)
        $(STRIP) $(PROG)
 
 install: $(PROG)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/banner/Makefile b/banner/Makefile
index 14d4c8b378d84dc8d5b9c67f9086303d4526e3b3..fb16d3abcb12257013d9f7e5a8482b5442baaee9 100644 (file)
--- a/banner/Makefile
+++ b/banner/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/battlestar/Makefile b/battlestar/Makefile
index 639f21a2e4213f3a064031c03673e1b027e4f14e..ebd7618731d6ff1fa585ae418b402f05284e237e 100644 (file)
--- a/battlestar/Makefile
+++ b/battlestar/Makefile
@@ -11,12 +11,12 @@ MAN=        battlestar.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/battlestar/pathnames.h b/battlestar/pathnames.h
index 0b2ed225edf2805a9aaca2f0e63ee521f1a755a3..a099711afb69c3a5a7f7c64a8fa1ec37611d1ef2 100644 (file)
--- a/battlestar/pathnames.h
+++ b/battlestar/pathnames.h
@@ -31,4 +31,6 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_SCORE     "/var/games/battlestar.log"
+#include "config.h"
+
+#define        _PATH_SCORE     LOCALSTATEDIR"/games/battlestar.log"

diff --git a/bcd/Makefile b/bcd/Makefile
index 8fe6400ccb2828c00cfaf80deb0fc57332dcf90a..768a9b02fcbef6a590a4c35b239c90463844ef86 100644 (file)
--- a/bcd/Makefile
+++ b/bcd/Makefile
@@ -13,10 +13,10 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       $(LN) -sf $(MAN).zst $(DESTDIR)/usr/share/man/man6/morse.6
-       $(LN) -sf $(MAN).zst $(DESTDIR)/usr/share/man/man6/ppt.6
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       $(LN) -sf $(MAN).zst $(DESTDIR)/$(PREFIX)/share/man/man6/morse.6
+       $(LN) -sf $(MAN).zst $(DESTDIR)/$(PREFIX)/share/man/man6/ppt.6
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/boggle/Makefile b/boggle/Makefile
index 4d5b869a69d459cc37e3666146552f9db6a4faf0..fba54e28d315bf79499979849f2d476924adb5ce 100644 (file)
--- a/boggle/Makefile
+++ b/boggle/Makefile
@@ -22,8 +22,8 @@ dictindex: mkindex dictionary
        ./mkindex/mkindex < dictionary > dictindex
 
 install: dictindex dictionary boggle
-       $(GINSTALL) -Dm644 dictionary $(DESTDIR)/usr/share/games/boggle/dictionary
-       $(GINSTALL) -Dm644 dictindex $(DESTDIR)/usr/share/games/boggle/dictindex
+       $(GINSTALL) -Dm644 dictionary $(DESTDIR)/$(PREFIX)/share/games/boggle/dictionary
+       $(GINSTALL) -Dm644 dictindex $(DESTDIR)/$(PREFIX)/share/games/boggle/dictindex
        $(MAKE) -C boggle install
 
 .PHONY: all clean install mkdict mkindex boggle

diff --git a/boggle/boggle/Makefile b/boggle/boggle/Makefile
index 770ef1717eccb52e7edf4ce183374dfe145460c1..b00489ba812a49644f0b1d9ee2cc4830aaf79b48 100644 (file)
--- a/boggle/boggle/Makefile
+++ b/boggle/boggle/Makefile
@@ -5,14 +5,14 @@ MAN=  boggle.6
 all: boggle
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG) -lncursesw -I$(ROOT)
        $(STRIP) boggle
 
 clean:
        rm -f boggle
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 .PHONY: all clean install

diff --git a/boggle/boggle/bog.h b/boggle/boggle/bog.h
index 7a0ae0607fe188e9bd4ad57723750c6a5abf03dd..44cf1b7daab6e2199adfdbf09023911f73563c2b 100644 (file)
--- a/boggle/boggle/bog.h
+++ b/boggle/boggle/bog.h
@@ -34,15 +34,17 @@
  *     @(#)bog.h       8.1 (Berkeley) 6/11/93
  */
 
+#include "config.h"
+
 #define LOADDICT               1       /* Load the dictionary for speed */
 
 /*
  * Locations for the dictionary (generated by mkdict),
  * index (generated by mkindex), and helpfile
  */
-#define DICT                   "/usr/share/games/boggle/dictionary"
-#define DICTINDEX              "/usr/share/games/boggle/dictindex"
-#define HELPFILE               "/usr/share/games/boggle/helpfile"
+#define DICT                   PREFIX"/share/games/boggle/dictionary"
+#define DICTINDEX              PREFIX"/share/games/boggle/dictindex"
+#define HELPFILE               PREFIX"/share/games/boggle/helpfile"
 
 /*
  * The theoretical maximum for MAXWORDLEN is ('a' - 1) == 96

diff --git a/boggle/mkdict/Makefile b/boggle/mkdict/Makefile
index 5370f497c56251ecc970c453ba98781ebfb16c2c..065c8e29c458602ce0cddb58a1d48eff216ee8ef 100644 (file)
--- a/boggle/mkdict/Makefile
+++ b/boggle/mkdict/Makefile
@@ -1,5 +1,5 @@
 mkdict: mkdict.c
-       clang -o mkdict mkdict.c -I../boggle
+       clang -o mkdict mkdict.c -I../boggle -I$(ROOT)
 
 clean:
        rm -f mkdict

diff --git a/boggle/mkindex/Makefile b/boggle/mkindex/Makefile
index a28736f4269343c4482369fef54df086d1b0fb0f..03a4e637c8dd51813021487ab5cd7e8a453964cd 100644 (file)
--- a/boggle/mkindex/Makefile
+++ b/boggle/mkindex/Makefile
@@ -1,5 +1,5 @@
 mkindex: mkindex.c
-       clang -o mkindex mkindex.c -I../boggle
+       clang -o mkindex mkindex.c -I../boggle -I$(ROOT)
 
 clean:
        rm -f mkindex

diff --git a/caesar/Makefile b/caesar/Makefile
index 236d2633ac4607843786f4d75d58993ae53f64b5..98651c4a4b2e0e853bd2f3629c7c7b7572bd1ef9 100644 (file)
--- a/caesar/Makefile
+++ b/caesar/Makefile
@@ -13,10 +13,10 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN) $(SCRIPTS)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/usr/games/$(basename $(SCRIPTS))
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       $(LN) -sf $(MAN).zst $(DESTDIR)/usr/share/man/man6/rot13.6
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/$(PREFIX)/games/$(basename $(SCRIPTS))
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       $(LN) -sf $(MAN).zst $(DESTDIR)/$(PREFIX)/share/man/man6/rot13.6
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/canfield/canfield/Makefile b/canfield/canfield/Makefile
index 847dc040efb5cff5293b2e13ff842c7c1c496d63..212710a4af0ef24dbd650b1022419bcbfc411167 100644 (file)
--- a/canfield/canfield/Makefile
+++ b/canfield/canfield/Makefile
@@ -8,12 +8,12 @@ SRCS= canfield.c
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/canfield/canfield/pathnames.h b/canfield/canfield/pathnames.h
index 88c1bb369e0df0ab01c3f3112dd7cc7fb01f650f..eecae02661ae4ff5b8a0827274724c3f6297b76b 100644 (file)
--- a/canfield/canfield/pathnames.h
+++ b/canfield/canfield/pathnames.h
@@ -31,5 +31,7 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_SCORE     "/var/games/cfscores"
+#include "config.h"
+
+#define        _PATH_SCORE     LOCALSTATEDIR"/games/cfscores"
 

diff --git a/canfield/cfscores/Makefile b/canfield/cfscores/Makefile
index f8c9518e456c252044994178ae88add804acb93e..4e32a5d27811bfa03e7a57f77edda26c00def8cb 100644 (file)
--- a/canfield/cfscores/Makefile
+++ b/canfield/cfscores/Makefile
@@ -7,11 +7,11 @@ SRCS=         cfscores.c
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I../canfield
+       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I../canfield -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/cgram/Makefile b/cgram/Makefile
index e99ceed202fa901ed4c232933df350133085037c..7992ad40da77d22f18b5e2e6c41b4b79f585a8cf 100644 (file)
--- a/cgram/Makefile
+++ b/cgram/Makefile
@@ -7,12 +7,12 @@ MAN=cgram.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/cgram/pathnames.h b/cgram/pathnames.h
index 51da95c9266d1ecf2e40d2d8226387ba06f9c330..e93a72dfcc71e560363ff1fedfa22890944aa427 100644 (file)
--- a/cgram/pathnames.h
+++ b/cgram/pathnames.h
@@ -27,4 +27,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define _PATH_FORTUNE "/usr/games/fortune"
+#include "config.h"
+
+#define _PATH_FORTUNE PREFIX"/games/fortune"

diff --git a/ching/castching/Makefile b/ching/castching/Makefile
index 905a9e32a28e893915397c0180833fe0e0f41e72..6bdfcf944c64ea79545a48bc0e6921ed89b3e657 100644 (file)
--- a/ching/castching/Makefile
+++ b/ching/castching/Makefile
@@ -2,7 +2,7 @@
 
 PROG=  castching
 SRCS=  castching.c
-BINDIR=        /usr/libexec/ching
+BINDIR=        $(PREFIX)/libexec/ching
 
 all: $(PROG)
 
@@ -11,7 +11,7 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/libexec/ching/$(PROG)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(BINDIR)/$(PROG)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/ching/ching/Makefile b/ching/ching/Makefile
index cd5d7eff36eb2f78bc019fa5697f2445575c22e6..e5d4d263f1ec9e96ac5dd4ba6de124dd2829d93c 100644 (file)
--- a/ching/ching/Makefile
+++ b/ching/ching/Makefile
@@ -4,13 +4,13 @@ SCRIPTS=ching.sh
 MAN=   ching.6
 
 FILES= hexagrams macros
-FILESDIR=/usr/share/games/ching
+FILESDIR=$(PREFIX)/share/games/ching
 
 all:
 
 install: $(PROG) $(MAN) $(SCRIPTS)
-       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/usr/games/$(basename $(SCRIPTS))
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/$(PREFIX)/games/$(basename $(SCRIPTS))
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
        $(GINSTALL) -d $(DESTDIR)$(FILESDIR)
        $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)$(FILESDIR)
 

diff --git a/ching/printching/Makefile b/ching/printching/Makefile
index 4adbc181728c2ccd4fd2edde36114f7bb77a28ed..e8e6634f48052b9bd220c63a9ac0a1730cb47729 100644 (file)
--- a/ching/printching/Makefile
+++ b/ching/printching/Makefile
@@ -6,11 +6,11 @@ SRCS= printching.c
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I../include
+       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I../include -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/libexec/ching/$(PROG)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/libexec/ching/$(PROG)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/ching/printching/pathnames.h b/ching/printching/pathnames.h
index d99626636a35b06f8944e21822aed2072435b50f..93cbb95e544244e70c1cd22e0c1d7bb32ad84c02 100644 (file)
--- a/ching/printching/pathnames.h
+++ b/ching/printching/pathnames.h
@@ -35,4 +35,6 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_HEX       "/usr/share/games/ching/hexagrams"
+#include "config.h"
+
+#define        _PATH_HEX       PREFIX"/share/games/ching/hexagrams"

diff --git a/colorbars/Makefile b/colorbars/Makefile
index dcc271ccb8e151bf6d8780461581d3a45fff00a2..86e6e073c2cdfe20ef3c6a8d3ac270690faa8d70 100644 (file)
--- a/colorbars/Makefile
+++ b/colorbars/Makefile
@@ -11,8 +11,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/countmail/Makefile b/countmail/Makefile
index 80a9d9b90149e7ae842cd8d7105cf05dfa7d9a62..e418eac182d9808e57c854aa8bf8538396449433 100644 (file)
--- a/countmail/Makefile
+++ b/countmail/Makefile
@@ -1,13 +1,12 @@
 #      $NetBSD: Makefile,v 1.3 1999/02/13 23:53:57 lukem Exp $
 
 SCRIPTS=       countmail
-SCRIPTSDIR=    /usr/games
 MAN=           countmail.6
 
 all:
 
 install: $(PROG) $(MAN) $(SCRIPTS)
-       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/usr/games/$(SCRIPTS)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/$(PREFIX)/games/$(SCRIPTS)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 .PHONY: all install clean

diff --git a/cribbage/Makefile b/cribbage/Makefile
index 19c2a38751ac5aeb8a3aac4c237ffc5fdf573339..45f9c718ab822cdec6497f437aebdf8f6f1d2786 100644 (file)
--- a/cribbage/Makefile
+++ b/cribbage/Makefile
@@ -10,13 +10,13 @@ FILESNAME=cribbage.instr
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)/usr/share/games/$(FILESNAME)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)/$(PREFIX)/share/games/$(FILESNAME)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/cribbage/pathnames.h b/cribbage/pathnames.h
index e16ecda9077de1ed93b954de561eb039fd55df67..eaf9d1bd958f8a7d3a58c21e77c9fb10f80c7689 100644 (file)
--- a/cribbage/pathnames.h
+++ b/cribbage/pathnames.h
@@ -31,6 +31,8 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_INSTR     "/usr/share/games/cribbage.instr"
-#define        _PATH_LOG       "/var/games/criblog"
-#define        _PATH_MORE      "/usr/bin/more"
+#include "config.h"
+
+#define        _PATH_INSTR     PREFIX"/share/games/cribbage.instr"
+#define        _PATH_LOG       LOCALSTATEDIR"/games/criblog"
+#define        _PATH_MORE      PREFIX"/bin/more"

diff --git a/dab/Makefile b/dab/Makefile
index b3e940ad9d66a15d3f655002d2812f9fff5ad7e5..8525f90738887bae712947fac2097316148d77dd 100644 (file)
--- a/dab/Makefile
+++ b/dab/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/dm/Makefile b/dm/Makefile
index 2b77c3707d3b425fd1ff21a5d7a4385c8838ab9e..ea7c949e50630ab68ede52cffbc9efa448b34862 100644 (file)
--- a/dm/Makefile
+++ b/dm/Makefile
@@ -9,13 +9,13 @@ MAN5= dm.conf.5
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -DSUPPORT_UTMPX
+       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -DSUPPORT_UTMPX -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN8) $(DESTDIR)/usr/share/man/man8/$(MAN8)
-       $(GINSTALL) -Dm644 $(MAN5) $(DESTDIR)/usr/share/man/man5/$(MAN5)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN8) $(DESTDIR)/$(PREFIX)/share/man/man8/$(MAN8)
+       $(GINSTALL) -Dm644 $(MAN5) $(DESTDIR)/$(PREFIX)/share/man/man5/$(MAN5)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/dm/pathnames.h b/dm/pathnames.h
index 9acdc5cd6c40c646575269c22e6f493c3baca3bc..3c768c36e7ee48170dab23c0efa2f956fea77425 100644 (file)
--- a/dm/pathnames.h
+++ b/dm/pathnames.h
@@ -31,7 +31,9 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_CONFIG    "/etc/dm.conf"
-#define        _PATH_HIDE      "/usr/games/hide/"
-#define        _PATH_LOG       "/var/log/games.log"
-#define        _PATH_NOGAMES   "/etc/nogames"
+#include "config.h"
+
+#define        _PATH_CONFIG    SYSCONFDIR"/dm.conf"
+#define        _PATH_HIDE      PREFIX"/games/hide/"
+#define        _PATH_LOG       LOCALSTATEDIR"/log/games.log"
+#define        _PATH_NOGAMES   SYSCONFDIR"/nogames"

diff --git a/factor/Makefile b/factor/Makefile
index b84802d38d08f150822a2036cb69063ea4a45449..1fea0f689675e54c9d8d3d5c80374338f2e4e047 100644 (file)
--- a/factor/Makefile
+++ b/factor/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/fish/Makefile b/fish/Makefile
index b6d2ac3691bd39cfbdfee8468c66244b7cbf23a1..392b744f19bdce7f6dd51a3806f5d881f547ef8a 100644 (file)
--- a/fish/Makefile
+++ b/fish/Makefile
@@ -9,13 +9,13 @@ FILES=fish.instr
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) -o $(PROG) $(SRCS)
+       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/bsd-$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/bsd-$(MAN)
-       $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)/usr/share/games/bsd-$(FILES)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/bsd-$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/bsd-$(MAN)
+       $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)/$(PREFIX)/share/games/bsd-$(FILES)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/fish/pathnames.h b/fish/pathnames.h
index 3dced4a8694b7874d48b7441fc8fe60886fbc0ef..9b40d1f483ebe7fd6e3ce95d840e49e1ed3d72bb 100644 (file)
--- a/fish/pathnames.h
+++ b/fish/pathnames.h
@@ -31,5 +31,7 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_INSTR     "/usr/share/games/fish.instr"
-#define        _PATH_MORE      "/usr/bin/more"
+#include "config.h"
+
+#define        _PATH_INSTR     PREFIX"/share/games/fish.instr"
+#define        _PATH_MORE      PREFIX"/bin/more"

diff --git a/gomoku/Makefile b/gomoku/Makefile
index 50895f7fc7850ac155c2e0ddaf90af82903ff7cb..7c1479f6820a5bd5e0abb0cf5815d8af7f87a68f 100644 (file)
--- a/gomoku/Makefile
+++ b/gomoku/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/hack/Makefile b/hack/Makefile
index 318f3034c0e76426a2fb39a9a76c6c8a4be72a55..c4aed9cbaf788c5a7021b6599db789b00219a970 100644 (file)
--- a/hack/Makefile
+++ b/hack/Makefile
@@ -16,7 +16,7 @@ SRCS+=        alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
 MAN=   hack.6
 CLEANFILES+=makedefs
 FILES=help hh data
-FILESDIR=/var/games/hackdir
+FILESDIR=$(LOCALSTATEDIR)/games/hackdir
 CLEANFILES+=hack.onames.h
 
 all: $(PROG)
@@ -30,12 +30,12 @@ makedefs: makedefs.c
 hack.h:        hack.onames.h
 
 $(PROG): $(SRCS) hack.h
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
        mkdir -p $(DESTDIR)$(FILESDIR)
        $(GINSTALL) -Dm660 $(FILES) $(DESTDIR)$(FILESDIR)
 

diff --git a/hack/def.objects.h b/hack/def.objects.h
index e9b34d17aaacd3072f86af514f165a0f87a2c6c9..3bed8c35a731884cc61be12988b12cc7eaae45cb 100644 (file)
--- a/hack/def.objects.h
+++ b/hack/def.objects.h
@@ -64,7 +64,7 @@
 #ifndef _DEF_OBJECTS_H_
 #define _DEF_OBJECTS_H_
 /* objects have letter " % ) ( 0 _ ` [ ! ? / = * */
-#include "config.h"
+#include "hack-config.h"
 #include "def.objclass.h"
 
 struct objclass objects[] = {

diff --git a/hack/config.h b/hack/hack-config.h
similarity index 100%
rename from hack/config.h
rename to hack/hack-config.h

diff --git a/hack/hack.h b/hack/hack.h
index 575b00ef9535625367e3814f4a37c385c7f37b1c..4579fae64b04ae28e3db7d0ad3ab8cfd203c3613 100644 (file)
--- a/hack/hack.h
+++ b/hack/hack.h
@@ -64,7 +64,7 @@
 #ifndef _HACK_H_
 #define _HACK_H_
 
-#include "config.h"
+#include "hack-config.h"
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>

diff --git a/hack/pathnames.h b/hack/pathnames.h
index 3af190e99f268c6d02b69774ebdeb9e1783c356b..bbd2fa7123f7969fe6e8f032ae2ce8517d6dfa93 100644 (file)
--- a/hack/pathnames.h
+++ b/hack/pathnames.h
@@ -31,7 +31,9 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_MAIL      "/usr/bin/mail"
-#define        _PATH_QUEST     "/var/games/questdir"
-#define        _PATH_HACK      "/var/games/hackdir"
+#include "config.h"
+
+#define        _PATH_MAIL      PREFIX"/bin/mail"
+#define        _PATH_QUEST     LOCALSTATEDIR"/games/questdir"
+#define        _PATH_HACK      LOCALSTATEDIR"/games/hackdir"
 

diff --git a/hals_end/Makefile b/hals_end/Makefile
index 89b10b30453db2da202b51ae132b361f0d97d714..4aff7ab39281278bde73f5fc52b6a7e094545680 100644 (file)
--- a/hals_end/Makefile
+++ b/hals_end/Makefile
@@ -11,8 +11,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/hangman/Makefile b/hangman/Makefile
index 0205e2666ca0ff62d15257656868ec4dc16c1d63..c6876220744ff374857dd7293d52efe53b15909d 100644 (file)
--- a/hangman/Makefile
+++ b/hangman/Makefile
@@ -9,12 +9,12 @@ MAN=  hangman.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/hangman/pathnames.h b/hangman/pathnames.h
index 74c7b7b644eac8b2c9a80e3d2c7f108d59153fa6..e11964e13c9bc3dc07260731103b1d077b2266d2 100644 (file)
--- a/hangman/pathnames.h
+++ b/hangman/pathnames.h
@@ -31,4 +31,6 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_DICT      "/usr/share/dict/words"
+#include "config.h"
+
+#define        _PATH_DICT      PREFIX"/share/dict/words"

diff --git a/hunt/hunt/Makefile b/hunt/hunt/Makefile
index 211b961992ac0b07ca2b9e94e9c356e5d9f2e5d6..8f898974ae0b10ac500790b6c245bfe813cc7736 100644 (file)
--- a/hunt/hunt/Makefile
+++ b/hunt/hunt/Makefile
@@ -7,12 +7,12 @@ MAN=  hunt.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) $(EXTRADEFS) -I../include -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) $(EXTRADEFS) -I../include -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/hunt/huntd/Makefile b/hunt/huntd/Makefile
index c90d71db40e85dffdd4188d741ac3b04a3ec03e0..385bb5b246b64ad8c9b0138eb8461c241fd0d93d 100644 (file)
--- a/hunt/huntd/Makefile
+++ b/hunt/huntd/Makefile
@@ -8,12 +8,12 @@ MAN=  huntd.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) $(EXTRADEFS) -I../include
+       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) $(EXTRADEFS) -I../include -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/hunt/include/pathnames.h b/hunt/include/pathnames.h
index 2595c9a0bef7353c896e6289bc85e7706288328c..e8cdf276cfb702526d4502ef5379f20796c91f8c 100644 (file)
--- a/hunt/include/pathnames.h
+++ b/hunt/include/pathnames.h
@@ -30,6 +30,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define PATH_HUNTD     "/usr/games/huntd"
+#include "config.h"
+
+#define PATH_HUNTD     PREFIX"/games/huntd"
 #define PATH_HUNTSOCKET        "/tmp/hunt"
 #define PATH_STATSOCKET        "/tmp/hunt.stats"

diff --git a/larn/Makefile b/larn/Makefile
index 643e19132b0bad798159723efa45748b4e2deb11..47b0ae1bff63012d51f6fe357dc98db382ddfc72 100644 (file)
--- a/larn/Makefile
+++ b/larn/Makefile
@@ -66,14 +66,14 @@ FILES= datfiles/larn.help datfiles/larnmaze datfiles/larnopts
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       $(GINSTALL) -d $(DESTDIR)/usr/share/games/larn
-       $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)/usr/share/games/larn/
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       $(GINSTALL) -d $(DESTDIR)/$(PREFIX)/share/games/larn
+       $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)/$(PREFIX)/share/games/larn/
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/larn/pathnames.h b/larn/pathnames.h
index 0790dfc448c72ce08908249edcf8fedc4421c161..8f7ba236e5e4eb73e168253f6eac16490c05851c 100644 (file)
--- a/larn/pathnames.h
+++ b/larn/pathnames.h
@@ -31,8 +31,10 @@
  *     @(#)pathnames.h 5.2 (Berkeley) 4/27/95
  */
 
-#define        _PATH_LOG               "/var/games/larn/llog12.0"
-#define        _PATH_SCORE             "/var/games/larn/lscore12.0"
-#define        _PATH_HELP              "/usr/share/games/larn/larn.help"
-#define        _PATH_LEVELS            "/usr/share/games/larn/larnmaze"
-#define        _PATH_PLAYERIDS         "/var/games/larn/playerids"
+#include "config.h"
+
+#define        _PATH_LOG               LOCALSTATEDIR"/games/larn/llog12.0"
+#define        _PATH_SCORE             LOCALSTATEDIR"/games/larn/lscore12.0"
+#define        _PATH_HELP              PREFIX"/share/games/larn/larn.help"
+#define        _PATH_LEVELS            PREFIX"/share/games/larn/larnmaze"
+#define        _PATH_PLAYERIDS         LOCALSTATEDIR"/games/larn/playerids"

diff --git a/mille/Makefile b/mille/Makefile
index a03c79f1d08a8028e7b330d4be095d688f721e46..090a3e2f7a911936628b9bc02088c524085d455e 100644 (file)
--- a/mille/Makefile
+++ b/mille/Makefile
@@ -13,8 +13,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/monop/Makefile b/monop/Makefile
index a41871f85eaa5483b59e4d4a1e069bae907fc449..7105af18ea6ae41fd2b8c9c11a0e2e76c6db6b79 100644 (file)
--- a/monop/Makefile
+++ b/monop/Makefile
@@ -13,8 +13,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/morse/Makefile b/morse/Makefile
index 70eba9998f255dd863cf554a3183d509f3eb47c7..7cc3b0535fa8e86bae689c31c333f98963abb045 100644 (file)
--- a/morse/Makefile
+++ b/morse/Makefile
@@ -11,7 +11,7 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/number/Makefile b/number/Makefile
index 22ccf93b49e624916a56941bdc711332fbfc52a3..eb50d2f3b8234f24902abf09a5ca84dd8483827d 100644 (file)
--- a/number/Makefile
+++ b/number/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/phantasia/Makefile b/phantasia/Makefile
index 3792164c10cd8f57e2ed24f6e0298b3b3a245d3d..c0a4484a924df2d8f2370729851b2d9f2e11a013 100644 (file)
--- a/phantasia/Makefile
+++ b/phantasia/Makefile
@@ -5,7 +5,7 @@ PROG=   phantasia
 SRCS=  fight.c gamesupport.c interplayer.c io.c main.c misc.c phantglobs.c
 MAN=   phantasia.6
 
-FILESDIR=/var/games/phantasia
+FILESDIR=$(LOCALSTATEDIR)/games/phantasia
 FILESMODE=0660
 ALLFILES=gold lastdead mess monsters void motd characs scoreboard
 FILES=gold lastdead mess monsters void motd
@@ -21,7 +21,7 @@ files.stamp: mkdata monsters.asc
        touch files.stamp
 
 mkdata: phantglobs.c setup.c
-       clang -o mkdata phantglobs.c setup.c
+       clang -o mkdata phantglobs.c setup.c -I$(ROOT)
 
 # Make Phantasia map.  Change the map commands reflect your installation.
 # PLOTDEVICE is used for plotting the map.  Change as appropriate.
@@ -31,14 +31,14 @@ map: map.c
        ./map | plot > /dev/tty
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 $(ALLFILES): $(FILES)
 
 install: $(PROG) $(MAN) $(ALLFILES)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
        $(GINSTALL) -d $(DESTDIR)$(FILESDIR)
        $(GINSTALL) -Dm$(FILESMODE) $(ALLFILES) $(DESTDIR)$(FILESDIR)
 

diff --git a/phantasia/pathnames.h b/phantasia/pathnames.h
index af287785889591787fd533d8046885b78bd87efd..5bfc3bc00f49c154fa7939adb0ffffb83134f595 100644 (file)
--- a/phantasia/pathnames.h
+++ b/phantasia/pathnames.h
@@ -31,12 +31,14 @@
  *     @(#)pathnames.h 8.2 (Berkeley) 4/2/94
  */
 
-#define        _PATH_GAMEPROG  "/usr/games/phantasia"
-#define        _PATH_GOLD      "/var/games/phantasia/gold"
-#define        _PATH_LASTDEAD  "/var/games/phantasia/lastdead"
-#define        _PATH_MESS      "/var/games/phantasia/mess"
-#define        _PATH_MONST     "/var/games/phantasia/monsters"
-#define        _PATH_MOTD      "/var/games/phantasia/motd"
-#define        _PATH_PEOPLE    "/var/games/phantasia/characs"
-#define        _PATH_SCORE     "/var/games/phantasia/scoreboard"
-#define        _PATH_VOID      "/var/games/phantasia/void"
+#include "config.h"
+
+#define        _PATH_GAMEPROG  PREFIX"/games/phantasia"
+#define        _PATH_GOLD      LOCALSTATEDIR"/games/phantasia/gold"
+#define        _PATH_LASTDEAD  LOCALSTATEDIR"/games/phantasia/lastdead"
+#define        _PATH_MESS      LOCALSTATEDIR"/games/phantasia/mess"
+#define        _PATH_MONST     LOCALSTATEDIR"/games/phantasia/monsters"
+#define        _PATH_MOTD      LOCALSTATEDIR"/games/phantasia/motd"
+#define        _PATH_PEOPLE    LOCALSTATEDIR"/games/phantasia/characs"
+#define        _PATH_SCORE     LOCALSTATEDIR"/games/phantasia/scoreboard"
+#define        _PATH_VOID      LOCALSTATEDIR"/games/phantasia/void"

diff --git a/pig/Makefile b/pig/Makefile
index 497efad95d2729b50bc33b1809a4664ed27ffcbc..a9f85f23f88f146d4dbb26fd7310ba14fe1a9375 100644 (file)
--- a/pig/Makefile
+++ b/pig/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/pom/Makefile b/pom/Makefile
index 686f4655b457859489412dc34026e3f81dc84d2e..f436cc2e55046ea9a2a67c73b78b4826806cd7be 100644 (file)
--- a/pom/Makefile
+++ b/pom/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/ppt/Makefile b/ppt/Makefile
index 0b58797df18b888902536189c1d2277d48306d6a..550028936a6b7ad3a810fe5b7bda6c111cd83434 100644 (file)
--- a/ppt/Makefile
+++ b/ppt/Makefile
@@ -11,7 +11,7 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/primes/Makefile b/primes/Makefile
index e0f0dad6c613e3a7525fc7a804f6bb83ccecaf2e..b20aad421836f50f4f301f232994def6aba178d5 100644 (file)
--- a/primes/Makefile
+++ b/primes/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/quiz/Makefile b/quiz/Makefile
index 54afe38670b67330a5db11d65f9af5c44b98ff56..54e1547da243f23e83e0a77b9f02e9e5c3f0695b 100644 (file)
--- a/quiz/Makefile
+++ b/quiz/Makefile
@@ -9,17 +9,17 @@ CATS= africa america areas arith asia babies bard chinese collectives \
        midearth morse mult murders poetry posneg pres province seq-easy \
        seq-hard sexes sov spell state trek ucc
 FILES= $(addprefix datfiles/,$(CATS))
-FILESDIR=/usr/share/games/quiz.db
+FILESDIR=$(PREFIX)/share/games/quiz.db
 
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) -o $(PROG) $(SRCS)
+       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
        $(GINSTALL) -d $(DESTDIR)$(FILESDIR)
        $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)$(FILESDIR)
 

diff --git a/quiz/pathnames.h b/quiz/pathnames.h
index 821cc29c8fcfbba19736ffeb41091c4941008fc3..01acdc253efd76d091f81a8d5be9659394d5249c 100644 (file)
--- a/quiz/pathnames.h
+++ b/quiz/pathnames.h
@@ -31,5 +31,7 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_PAGER     "/usr/bin/more"
-#define        _PATH_QUIZIDX   "/usr/share/games/quiz.db/index"
+#include "config.h"
+
+#define        _PATH_PAGER     PREFIX"/bin/more"
+#define        _PATH_QUIZIDX   PREFIX"/share/games/quiz.db/index"

diff --git a/rain/Makefile b/rain/Makefile
index 0f8a9224b58207443cd5e96f129d211d03c7dfdb..db13b2335e8d191c85eb2ec9d04b218351c365df 100644 (file)
--- a/rain/Makefile
+++ b/rain/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/random/Makefile b/random/Makefile
index cad8a5de4c8404b4c6e8fb1e7f4456e2ad1c06dc..2cd339be26e73dc7cbc3b9eeaa288e6def0a2b33 100644 (file)
--- a/random/Makefile
+++ b/random/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/robots/Makefile b/robots/Makefile
index 293ea7d8b6ce54fcb5d8b68f71ae6032f3768281..eb71c00a324164de38300d5592950e6e3b16bc46 100644 (file)
--- a/robots/Makefile
+++ b/robots/Makefile
@@ -10,13 +10,13 @@ MAN=        robots.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       $(GINSTALL) -d $(DESTDIR)/var/games
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       $(GINSTALL) -d $(DESTDIR)/$(LOCALSTATEDIR)/games
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/robots/pathnames.h b/robots/pathnames.h
index 152810e63cd29a21c64bd21bb8f490ec2a4fd859..fe3500bae64c9e763ff9ebc4c1f5ad13e4802874 100644 (file)
--- a/robots/pathnames.h
+++ b/robots/pathnames.h
@@ -31,4 +31,6 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_SCORE     "/var/games/robots_roll"
+#include "config.h"
+
+#define        _PATH_SCORE     LOCALSTATEDIR"/games/robots_roll"

diff --git a/rogue/Makefile b/rogue/Makefile
index 07b115de1af6de7dab1ba7ec627adf45d6c6dc1d..a1c8d834533c19e926320cde5b7a60107913428d 100644 (file)
--- a/rogue/Makefile
+++ b/rogue/Makefile
@@ -11,13 +11,13 @@ MAN=        rogue.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       $(GINSTALL) -d $(DESTDIR)/var/games
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       $(GINSTALL) -d $(DESTDIR)/$(LOCALSTATEDIR)/games
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/rogue/pathnames.h b/rogue/pathnames.h
index d6e91a5706e081296a4461dc1d53db5c35423a25..e27f6d09b27bc816445419429bd1fca33cfe515e 100644 (file)
--- a/rogue/pathnames.h
+++ b/rogue/pathnames.h
@@ -31,5 +31,7 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_SCOREFILE "/var/games/rogue.scores"
+#include "config.h"
+
+#define        _PATH_SCOREFILE LOCALSTATEDIR"/games/rogue.scores"
 #define _PATH_SCREENDUMP "rogue.screen"

diff --git a/sail/Makefile b/sail/Makefile
index 6d50ae19182677d3c9b73a5adfcc5e739cbb5bdb..4eac58beceedc14b297ea763c616703f62002ea2 100644 (file)
--- a/sail/Makefile
+++ b/sail/Makefile
@@ -10,13 +10,13 @@ MAN=        sail.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       $(GINSTALL) -d $(DESTDIR)/var/games
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       $(GINSTALL) -d $(DESTDIR)/$(LOCALSTATEDIR)/games
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/sail/pathnames.h b/sail/pathnames.h
index 65bc364165b67c8a1f8aacb955bb2d94af98db4f..46a657ec867df439cfb7da25bff107eeeab1c6bf 100644 (file)
--- a/sail/pathnames.h
+++ b/sail/pathnames.h
@@ -31,8 +31,10 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_LOGFILE   "/var/games/saillog"
-#define        _PATH_SAILDIR   "/var/games/sail"
+#include "config.h"
+
+#define        _PATH_LOGFILE   LOCALSTATEDIR"/games/saillog"
+#define        _PATH_SAILDIR   LOCALSTATEDIR"/games/sail"
 
 /* in _PATH_SAILDIR */
 #define        _FILE_SYNC      "#sailsink.%d"

diff --git a/snake/snake/Makefile b/snake/snake/Makefile
index 131ba12dbc5dbf5a3edd79693f50a3af24d24929..5ff9c430fcd8a20f6c9a29091bb8d01287232197 100644 (file)
--- a/snake/snake/Makefile
+++ b/snake/snake/Makefile
@@ -8,13 +8,13 @@ MAN=  snake.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       $(GINSTALL) -d $(DESTDIR)/var/games
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       $(GINSTALL) -d $(DESTDIR)/$(LOCALSTATEDIR)/games
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/snake/snake/pathnames.h b/snake/snake/pathnames.h
index dcd8b0b6f553d0e01a7059f82c3a8ccb506c57ea..faf7f269ada151bbd0dfe035b946110175966e73 100644 (file)
--- a/snake/snake/pathnames.h
+++ b/snake/snake/pathnames.h
@@ -31,5 +31,7 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_RAWSCORES "/var/games/snakerawscores"
-#define        _PATH_LOGFILE   "/var/games/snake.log"
+#include "config.h"
+
+#define        _PATH_RAWSCORES LOCALSTATEDIR"/games/snakerawscores"
+#define        _PATH_LOGFILE   LOCALSTATEDIR"/games/snake.log"

diff --git a/snake/snscore/Makefile b/snake/snscore/Makefile
index 945b34d56a634b9e2dc079ba9bfc62be03e79dbf..0a71046a3d7bfa6de670633eaaad10a7a0a061a6 100644 (file)
--- a/snake/snscore/Makefile
+++ b/snake/snscore/Makefile
@@ -7,11 +7,11 @@ SRCS=         snscore.c
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I../snake
+       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I../snake -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/testpat/Makefile b/testpat/Makefile
index 40a1d702c021673f17c06e2210926f63cb67df0e..abc82d12f61e6a1797329377ae1e12343b07a43f 100644 (file)
--- a/testpat/Makefile
+++ b/testpat/Makefile
@@ -11,8 +11,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/tetris/Makefile b/tetris/Makefile
index aeda79a958024970577ad8f0b286e1e86656aac9..ebec48b6f97187c294225140f6961a8519a1eb03 100644 (file)
--- a/tetris/Makefile
+++ b/tetris/Makefile
@@ -8,13 +8,13 @@ MAN=  tetris.6
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
-       $(GINSTALL) -d $(DESTDIR)/var/games
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
+       $(GINSTALL) -d $(DESTDIR)/$(LOCALSTATEDIR)/games
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/tetris/pathnames.h b/tetris/pathnames.h
index f96e3cc592a2363ee094f33bbcb8cbef251981bb..5a9ccc04fe3af7510241a605d7f4c78cfb29071b 100644 (file)
--- a/tetris/pathnames.h
+++ b/tetris/pathnames.h
@@ -34,4 +34,6 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define _PATH_SCOREFILE        "/var/games/tetris.scores"
+#include "config.h"
+
+#define _PATH_SCOREFILE        LOCALSTATEDIR"/games/tetris.scores"

diff --git a/trek/Makefile b/trek/Makefile
index 1b70260563aab920faa8e09b2f959f3bd8fe2094..acdf7d2b2ea66c453bdcba6badb34ac3ae4d805c 100644 (file)
--- a/trek/Makefile
+++ b/trek/Makefile
@@ -19,8 +19,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/wargames/Makefile b/wargames/Makefile
index df1a97d6ba7e7cd653d3649286d53df3f90f0ff7..32aae0af9233cd29f1a0e77ec83d077af0423c1e 100644 (file)
--- a/wargames/Makefile
+++ b/wargames/Makefile
@@ -7,7 +7,7 @@ MAN=    wargames.6
 all:
 
 install: $(MAN) $(SCRIPTS)
-       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/usr/games/$(basename $(SCRIPTS))
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/$(PREFIX)/games/$(basename $(SCRIPTS))
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 .PHONY: all install clean

diff --git a/warp/Makefile b/warp/Makefile
index 0e674c14118efffe8ea32687868572607cf12709..855b68af9bfc9963d211948a15c9b75fcb029e65 100644 (file)
--- a/warp/Makefile
+++ b/warp/Makefile
@@ -11,17 +11,17 @@ CLEANFILES+=warp.6
 MAN=   warp.6
 
 FILES=smap.0 smap.1 smap.2 smap.3 smap.4 smap.5 smap.6 smap.7
-FILESDIR=/usr/share/games/warp
+FILESDIR=$(PREFIX)/share/games/warp
 
 all: $(PROG) $(MAN) $(FILES)
 
 $(PROG): $(SRCS)
-       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN) $(FILES)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
        $(GINSTALL) -d $(DESTDIR)$(FILESDIR)
        $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)$(FILESDIR)
 
@@ -56,6 +56,6 @@ smap.7: smp.7 sm
        ./sm < smp.7 > $@
 
 sm: sm.c
-       clang -o $@ sm.c
+       clang -o $@ sm.c -I$(ROOT)
 
 .PHONY: all clean install

diff --git a/warp/sm.c b/warp/sm.c
index 69b104019f47dfdc5998ab1bcf5d30bb9327b222..a91c64ac5af677d5ebc5c2fad89fd1a2646148e0 100644 (file)
--- a/warp/sm.c
+++ b/warp/sm.c
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "config.h"
+#include "warp-config.h"
 
 int
 main(void)

diff --git a/warp/config.h b/warp/warp-config.h
similarity index 97%
rename from warp/config.h
rename to warp/warp-config.h
index 8f4d28a4353ad33a19b7a4d8329a347724e5ad5f..825991a322bebedd9299828aa2246d52c95460fa 100644 (file)
--- a/warp/config.h
+++ b/warp/warp-config.h
@@ -1,3 +1,5 @@
+#include "config.h"
+
 /* RDCHK:
  *     This symbol, if defined, indicates that the rdchk routine is available
  *     to find out if there is input pending on an IO channel.  Generally
@@ -83,7 +85,7 @@
  *     This symbol contains the full name of the preferred user shell on this
  *     system.  Usual values are /bin/csh, /bin/ksh, /bin/sh.
  */
-#define PREFSHELL "/bin/csh"           /**/
+#define PREFSHELL "/bin/sh"            /**/
 
 /* ROOTID:
  *     This symbol contains the uid of root, normally 0.
@@ -113,4 +115,4 @@
 #endif
 
 /* warp private library, may use ~ expansion, %x and %l */
-#define PRIVLIB "/usr/share/games/warp"                /**/
+#define PRIVLIB PREFIX"/share/games/warp"              /**/

diff --git a/warp/warp.h b/warp/warp.h
index 24abfdc307c5a102b064e34b9d47934019bd18ba..4dabe7be5bd7357477953093f69441f1deb86225 100644 (file)
--- a/warp/warp.h
+++ b/warp/warp.h
@@ -15,7 +15,8 @@
 #ifndef WARP_H
 #define WARP_H
 
-#include "config.h"    /* generated by Configure script */
+#include "config.h"
+#include "warp-config.h"       /* generated by Configure script */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -43,7 +44,7 @@
  * access.)
  */
 
-#define SAVEDIR "/var/games/warp"
+#define SAVEDIR LOCALSTATEDIR"/games/warp"
 #define NEWSFILE "warp.news"
 #define HELPFILE "warp.doc"
 #define LOCKFILE ".warp.lock"
@@ -59,7 +60,7 @@
 #   ifdef PRIVLIB
 #      define WARPLIB PRIVLIB
 #   else
-#      define WARPLIB "/usr/games/warp"
+#      define WARPLIB PREFIX"/games/warp"
 #   endif
 #endif
 
@@ -267,7 +268,7 @@ EXT char amb[YSIZE][XSIZE];
 /* preferred shell for use in doshell routine */
 /*  ksh or sh would be okay here */
 #ifndef PREFSHELL
-#   define PREFSHELL "/bin/csh"
+#   define PREFSHELL "/bin/sh"
 #endif
 
 /* path to fastest starting shell */

diff --git a/worm/Makefile b/worm/Makefile
index 99985b1183efa20a5403bdcd402a46f21f18ede2..b57264eef31c538cb774da6f38a67a00a4e821c8 100644 (file)
--- a/worm/Makefile
+++ b/worm/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/worms/Makefile b/worms/Makefile
index f96a8bbd5c3a6c7e249489a49e954b6c084bf0de..d1fda31c7c844416f7255d25248cbe8557e00294 100644 (file)
--- a/worms/Makefile
+++ b/worms/Makefile
@@ -12,8 +12,8 @@ $(PROG): $(SRCS)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 clean:
        rm -f $(CLEANFILES) $(PROG)

diff --git a/wtf/Makefile b/wtf/Makefile
index b5c694e8fb3f927804382ac393bca673658ec224..9a6ff806384b5e0e04d9b40fb019999163b9aade 100644 (file)
--- a/wtf/Makefile
+++ b/wtf/Makefile
@@ -6,7 +6,7 @@ MAN=            wtf.6
 all:
 
 install: $(MAN) $(SCRIPTS)
-       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/usr/games/$(basename $(SCRIPTS))
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm755 $(SCRIPTS) $(DESTDIR)/$(PREFIX)/games/$(basename $(SCRIPTS))
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
 
 .PHONY: all install clean

diff --git a/wump/Makefile b/wump/Makefile
index 49ca65889ee82d535711b3893304c0365e269b92..43bdc1da324a4be11d811df24c3d467b59e11136 100644 (file)
--- a/wump/Makefile
+++ b/wump/Makefile
@@ -5,17 +5,17 @@ PROG= wump
 MAN=   wump.6
 SRCS=  wump.c
 FILES=wump.info
-FILESDIR=/usr/share/games
+FILESDIR=$(PREFIX)/share/games
 
 all: $(PROG)
 
 $(PROG): $(SRCS)
-       $(CC) $(CFLAGS) -o $(PROG) $(SRCS)
+       $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I$(ROOT)
        $(STRIP) $(PROG)
 
 install: $(PROG) $(MAN)
-       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
-       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+       $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG)
+       $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN)
        $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)$(FILESDIR)
 
 clean:

diff --git a/wump/pathnames.h b/wump/pathnames.h
index d3984f12ac3e7a348871a63b427a4b849da2872e..c1e99eb4875f9a2160d2cc179e51d3f6897b4f08 100644 (file)
--- a/wump/pathnames.h
+++ b/wump/pathnames.h
@@ -31,5 +31,7 @@
  *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_PAGER     "/usr/bin/more"
-#define        _PATH_WUMPINFO  "/usr/share/games/wump.info"
+#include "config.h"
+
+#define        _PATH_PAGER     PREFIX"/bin/more"
+#define        _PATH_WUMPINFO  PREFIX"/share/games/wump.info"