summaryrefslogtreecommitdiffstats
path: root/fish
diff options
context:
space:
mode:
authorCameron Katri <me@cameronkatri.com>2021-03-28 14:39:02 -0400
committerCameron Katri <me@cameronkatri.com>2021-03-28 14:39:02 -0400
commit23454acb66be2a88647262d98d50e0f115519ea0 (patch)
treec593751ce3649be2e502fac3e080d6c0045b9fa0 /fish
parent08eca96e71d96ad1f8e9b888875ab5570f208d19 (diff)
downloadbsdgames-darwin-23454acb66be2a88647262d98d50e0f115519ea0.tar.gz
bsdgames-darwin-23454acb66be2a88647262d98d50e0f115519ea0.tar.zst
bsdgames-darwin-23454acb66be2a88647262d98d50e0f115519ea0.zip
Use PREFIX now
Diffstat (limited to 'fish')
-rw-r--r--fish/Makefile8
-rw-r--r--fish/pathnames.h6
2 files changed, 8 insertions, 6 deletions
diff --git a/fish/Makefile b/fish/Makefile
index b6d2ac36..392b744f 100644
--- a/fish/Makefile
+++ b/fish/Makefile
@@ -9,13 +9,13 @@ FILES=fish.instr
all: $(PROG)
$(PROG): $(SRCS)
- $(CC) $(CFLAGS) -o $(PROG) $(SRCS)
+ $(CC) $(CFLAGS) -o $(PROG) $(SRCS) -I$(ROOT)
$(STRIP) $(PROG)
install: $(PROG) $(MAN)
- $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/bsd-$(PROG)
- $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/bsd-$(MAN)
- $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)/usr/share/games/bsd-$(FILES)
+ $(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/$(PREFIX)/games/bsd-$(PROG)
+ $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/bsd-$(MAN)
+ $(GINSTALL) -Dm644 $(FILES) $(DESTDIR)/$(PREFIX)/share/games/bsd-$(FILES)
clean:
rm -f $(CLEANFILES) $(PROG)
diff --git a/fish/pathnames.h b/fish/pathnames.h
index 3dced4a8..9b40d1f4 100644
--- a/fish/pathnames.h
+++ b/fish/pathnames.h
@@ -31,5 +31,7 @@
* @(#)pathnames.h 8.1 (Berkeley) 5/31/93
*/
-#define _PATH_INSTR "/usr/share/games/fish.instr"
-#define _PATH_MORE "/usr/bin/more"
+#include "config.h"
+
+#define _PATH_INSTR PREFIX"/share/games/fish.instr"
+#define _PATH_MORE PREFIX"/bin/more"