From 9688282d013caad855efaffb2adc0686511a4ceb Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Sat, 19 Feb 2022 20:34:30 +0100
Subject: Improve makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 40a5af6..397f50a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,19 @@
-.NONPOSIX:
+.POSIX:
 
 CONFIGFILE = config.mk
+include $(CONFIGFILE)
+
+OS = linux
+# Linux:   linux
+# Mac OS:  macos
+# Windows: windows
+include mk/$(OS).mk
 
-OSCONFIGFILE = linux.mk
-# Change to macos.mk for Mac OS
 
 LIB_MAJOR = 1
 LIB_MINOR = 0
 LIB_VERSION = $(LIB_MAJOR).$(LIB_MINOR)
 
-include $(CONFIGFILE)
-include $(OSCONFIGFILE)
 
 HDR =\
 	libsha1.h\
@@ -34,7 +37,7 @@ OBJ =\
 	sum_fd.o\
 	unhex.o\
 	unmarshal.o\
-	update.o\
+	update.o
 
 MAN0 =\
 	libsha1.h.0
@@ -92,6 +95,7 @@ install: libsha1.a libsha1.$(LIBEXT)
 	mkdir -p -- "$(DESTDIR)$(MANPREFIX)/man3"
 	cp -- libsha1.a "$(DESTDIR)$(PREFIX)/lib"
 	cp -- libsha1.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libsha1.$(LIBMINOREXT)"
+	$(FIX_INSTALL_NAME) -- "$(DESTDIR)$(PREFIX)/lib/libsha1.$(LIBMINOREXT)"
 	ln -sf -- "libsha1.$(LIBMINOREXT).$(LIB_MINOR)" "$(DESTDIR)$(PREFIX)/lib/libsha1.$(LIBMAJOREXT)"
 	ln -sf -- "libsha1.$(LIBMAJOREXT)" "$(DESTDIR)$(PREFIX)/lib/libsha1.$(LIBEXT)"
 	cp -- libsha1.h "$(DESTDIR)$(PREFIX)/include"
-- 
cgit v1.2.3-70-g09d2