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 --- ching/castching/Makefile | 4 ++-- ching/ching/Makefile | 6 +++--- ching/printching/Makefile | 4 ++-- ching/printching/pathnames.h | 4 +++- 4 files changed, 10 insertions(+), 8 deletions(-) (limited to 'ching') diff --git a/ching/castching/Makefile b/ching/castching/Makefile index 905a9e32..6bdfcf94 100644 --- 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 cd5d7eff..e5d4d263 100644 --- 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 4adbc181..e8e6634f 100644 --- 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 d9962663..93cbb95e 100644 --- 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" -- cgit v1.2.3-56-ge451