aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2022-02-19 15:50:46 +0100
committerGitHub <noreply@github.com>2022-02-19 15:50:46 +0100
commit2f3ed0f9243cebe3543c704f4595bdbf8fd142f2 (patch)
treed23812f325d72146aa2ab755b8cdc062da80de11
parentUpdate readme (diff)
parentSet install name for installed library (diff)
downloadlibkeccak-2f3ed0f9243cebe3543c704f4595bdbf8fd142f2.tar.gz
libkeccak-2f3ed0f9243cebe3543c704f4595bdbf8fd142f2.tar.bz2
libkeccak-2f3ed0f9243cebe3543c704f4595bdbf8fd142f2.tar.xz
Merge pull request #17 from carlocab/install-name
Set install name in `LIBFLAGS`
-rw-r--r--Makefile2
-rw-r--r--macos.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4f26280..10926cb 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,6 @@ $(OBJ): $(HDR)
libkeccak.$(LIBEXT): $(OBJ)
$(CC) $(LIBFLAGS) -o $@ $(OBJ) $(LDFLAGS)
- $(FIX_INSTALL_NAME)
libkeccak.a: $(OBJ)
-rm -f -- $@
@@ -178,6 +177,7 @@ run-benchmark: benchmark benchfile
install: libkeccak.$(LIBEXT) libkeccak.a
mkdir -p -- "$(DESTDIR)$(PREFIX)/lib"
cp -- libkeccak.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBMINOREXT)"
+ $(FIX_INSTALL_NAME)
ln -sf -- libkeccak.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBMAJOREXT)"
ln -sf -- libkeccak.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBEXT)"
cp -- libkeccak.a "$(DESTDIR)$(PREFIX)/lib/libkeccak.a"
diff --git a/macos.mk b/macos.mk
index 25c308b..83b6515 100644
--- a/macos.mk
+++ b/macos.mk
@@ -4,4 +4,4 @@ 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)"
+FIX_INSTALL_NAME = install_name_tool -id "$(PREFIX)/lib/libkeccak.$(LIBMAJOREXT)" "$(DESTDIR)$(PREFIX)/lib/libkeccak.$(LIBEXT)"