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 --- hunt/hunt/Makefile | 6 +++--- hunt/huntd/Makefile | 6 +++--- hunt/include/pathnames.h | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'hunt') diff --git a/hunt/hunt/Makefile b/hunt/hunt/Makefile index 211b9619..8f898974 100644 --- 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 c90d71db..385bb5b2 100644 --- 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 2595c9a0..e8cdf276 100644 --- 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" -- cgit v1.2.3-56-ge451