From cd3811988891609bf0f7fde3dbf78357969579c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 31 Aug 2018 10:17:07 +0200 Subject: [PATCH] zkey: Be consistent when referring to libutil.a MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Link: https://github.com/ibm-s390-tools/s390-tools/pull/35 Signed-off-by: Dan Horák Acked-by: Ingo Franzki Signed-off-by: Jan Höppner --- zkey/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zkey/Makefile b/zkey/Makefile index 725cb3ba..7e2047a2 100644 --- a/zkey/Makefile +++ b/zkey/Makefile @@ -22,7 +22,7 @@ else INSTALL_TARGETS += zkey-cryptsetup-skip-cryptsetup2 endif -LIBS = $(rootdir)/libutil/libutil.a +libs = $(rootdir)/libutil/libutil.a detect-libcryptsetup.h: echo "#include " > detect-libcryptsetup.h @@ -69,10 +69,10 @@ keystore.o: keystore.c keystore.h properties.h zkey-cryptsetup.o: check-dep-zkey-cryptsetup zkey-cryptsetup.c pkey.h misc.h zkey: LDLIBS = -ldl -lcrypto -zkey: zkey.o pkey.o properties.o keystore.o $(LIBS) +zkey: zkey.o pkey.o properties.o keystore.o $(libs) zkey-cryptsetup: LDLIBS = -ldl -lcryptsetup -ljson-c -zkey-cryptsetup: zkey-cryptsetup.o pkey.o $(LIBS) +zkey-cryptsetup: zkey-cryptsetup.o pkey.o $(libs) install-common: $(INSTALL) -d -m 755 $(DESTDIR)$(USRBINDIR)