From 23454acb66be2a88647262d98d50e0f115519ea0 Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Sun, 28 Mar 2021 14:39:02 -0400 Subject: Use PREFIX now --- canfield/canfield/Makefile | 6 +++--- canfield/canfield/pathnames.h | 4 +++- canfield/cfscores/Makefile | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'canfield') diff --git a/canfield/canfield/Makefile b/canfield/canfield/Makefile index 847dc040..212710a4 100644 --- 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 88c1bb36..eecae026 100644 --- 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 f8c9518e..4e32a5d2 100644 --- 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) -- cgit v1.2.3-56-ge451