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 --- dm/Makefile | 8 ++++---- dm/pathnames.h | 10 ++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'dm') diff --git a/dm/Makefile b/dm/Makefile index 2b77c370..ea7c949e 100644 --- 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 9acdc5cd..3c768c36 100644 --- 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" -- cgit v1.2.3-56-ge451