Remove use of ifeq in Makefile and move use of install_name_tool from install-time to build-time

Signed-off-by: Mattias Andrée <maandree@kth.se>

3 files changed, 5 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index c52fe9e..4f26280 100644
--- a/Makefile
+++ b/Makefile
@@ -139,6 +139,7 @@ $(OBJ): $(HDR)
 
 libkeccak.$(LIBEXT): $(OBJ)
 	$(CC) $(LIBFLAGS) -o $@ $(OBJ) $(LDFLAGS)
+	$(FIX_INSTALL_NAME)
 
 libkeccak.a: $(OBJ)
 	-rm -f -- $@
@@ -175,9 +176,6 @@ run-benchmark: benchmark benchfile
 	for i in $$(seq 7) ; do ./benchmark ; done | median
 
 install: libkeccak.$(LIBEXT) libkeccak.a
-ifeq ($(shell uname),Darwin)
-	install_name_tool -id "$(PREFIX)/lib/libkeccak.$(LIBMAJOREXT)" libkeccak.$(LIBEXT)
-endif
 	mkdir -p -- "$(DESTDIR)$(PREFIX)/lib"
 	cp -- libkeccak.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBMINOREXT)"
 	ln -sf -- libkeccak.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBMAJOREXT)"
diff --git a/linux.mk b/linux.mk
index c9f74a0..d617684 100644
--- a/linux.mk
+++ b/linux.mk
@@ -3,3 +3,5 @@ LIBFLAGS = -shared -Wl,-soname,libkeccak.$(LIBEXT).$(LIB_MAJOR)
 
 LIBMAJOREXT = $(LIBEXT).$(LIB_MAJOR)
 LIBMINOREXT = $(LIBEXT).$(LIB_VERSION)
+
+FIX_INSTALL_NAME = :
diff --git a/macos.mk b/macos.mk
index c7e7c28..25c308b 100644
--- a/macos.mk
+++ b/macos.mk
@@ -3,3 +3,5 @@ LIBFLAGS = -dynamiclib -Wl,-compatibility_version,$(LIB_MAJOR) -Wl,-current_vers
 
 LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT)
 LIBMINOREXT = $(LIB_VERSION).$(LIBEXT)
+
+FIX_INSTALL_NAME = install_name_tool -id "$(PREFIX)/lib/libkeccak.$(LIBMAJOREXT)" "libkeccak.$(LIBEXT)"