From 200fdab221b2b9bf4954bad9c778512a5134a787 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 18 Feb 2022 20:49:37 -0500 Subject: Updated installation to respect overriden prefix etc --- Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 40d2712..b1ad36b 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,11 @@ OBJECTS = $(SOURCES:.cc=.o) DEPS = $(OBJECTS:.o=.d) EXECUTABLE = bible LIBRARY = libbible.so -PREFIX := /usr +PREFIX ?= /usr +EXEC_PREFIX ?= $(PREFIX) +LIBDIR ?= $(EXEC_PREFIX)/lib +BINDIR ?= $(EXEC_PREFIX)/bin +INCLUDEDIR ?= $(PREFIX)/include $(EXECUTABLE): $(OBJECTS) $(CXX) $(OBJECTS) -o $@ $(LDFLAGS) @@ -21,12 +25,12 @@ test: $(LIBRARY) $(MAKE) -C src/test/ test install: $(LIBRARY) $(EXECUTABLE) - install -d $(DESTDIR)$(PREFIX)/lib/ - install -m 644 $(LIBRARY) $(DESTDIR)$(PREFIX)/lib/ - install -d $(DESTDIR)$(PREFIX)/include/ - install -m 644 src/lib/libbible.h $(DESTDIR)$(PREFIX)/include/ - install -d $(DESTDIR)$(PREFIX)/bin/ - install -m 755 $(EXECUTABLE) $(DESTDIR)$(PREFIX)/bin/ + install -d $(DESTDIR)$(LIBDIR) + install -m 644 $(LIBRARY) $(DESTDIR)$(LIBDIR) + install -d $(DESTDIR)$(INCLUDEDIR) + install -m 644 src/lib/libbible.h $(DESTDIR)$(INCLUDEDIR) + install -d $(DESTDIR)$(BINDIR) + install -m 755 $(EXECUTABLE) $(DESTDIR)$(BINDIR) install -d $(DESTDIR)`pkg-config --variable=completionsdir bash-completion` install -m 644 bible.bash $(DESTDIR)`pkg-config --variable=completionsdir bash-completion`/$(EXECUTABLE) -- cgit v1.2.3