From 23454acb66be2a88647262d98d50e0f115519ea0 Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Sun, 28 Mar 2021 14:39:02 -0400
Subject: Use PREFIX now

---
 boggle/Makefile         | 4 ++--
 boggle/boggle/Makefile  | 6 +++---
 boggle/boggle/bog.h     | 8 +++++---
 boggle/mkdict/Makefile  | 2 +-
 boggle/mkindex/Makefile | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'boggle')

diff --git a/boggle/Makefile b/boggle/Makefile
index 4d5b869a..fba54e28 100644
--- 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 770ef171..b00489ba 100644
--- 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 7a0ae060..44cf1b7d 100644
--- 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 5370f497..065c8e29 100644
--- 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 a28736f4..03a4e637 100644
--- 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
-- 
cgit v1.2.3-56-ge451