From 79c59f93b7461082cf4aec3025257560fc788c69 Mon Sep 17 00:00:00 2001 From: latex Date: Mon, 6 Feb 2023 17:22:26 +0100 Subject: make install more configurable --- Makefile | 11 +++++++---- config.mk | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 65c0a9c..0e60318 100644 --- a/Makefile +++ b/Makefile @@ -38,13 +38,16 @@ clean: rm -rf $(SNAME) $(DNAME) $(BUILD_DIR) src/*.pb.h src/*.pb.c $(MAKE) -C tests clean -install-header: - install -m 644 $(H) $(DESTDIR)$(PREFIX)/include +install-header: $(H) + install -d $(DESTDIR)$(INCLUDEDIR) + install -m 644 $^ $(DESTDIR)$(INCLUDEDIR) install-static: $(SNAME) - install -m 755 $(SNAME) $(DESTDIR)$(PREFIX)/lib64 + install -d $(DESTDIR)$(LIBDIR) + install -m 755 $^ $(DESTDIR)$(LIBDIR) install-shared: $(DNAME) - install -m 755 $(DNAME) $(DESTDIR)$(PREFIX)/lib64 + install -d $(DESTDIR)$(LIBDIR) + install -m 755 $^ $(DESTDIR)$(LIBDIR) install: install-header install-static install-shared diff --git a/config.mk b/config.mk index 18edba8..8a70d53 100644 --- a/config.mk +++ b/config.mk @@ -1,6 +1,8 @@ ifeq ($(PREFIX),) PREFIX = /usr/local endif +INCLUDEDIR = $(PREFIX)/include +LIBDIR = $(PREFIX)/lib BUILD_DIR = build NAME = libumumble -- cgit 1.4.1-2-gfad0