From 75675ec6270e59534dde8c49c22e093cb59f9308 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Wed, 18 Nov 2020 10:09:49 +0100 Subject: [PATCH] libekmfweb: Make install directory for shared libraries configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If LIBDIR is not passed to the make invocation, install shared libraries to USRLIB64DIR (/usr/lib64/), even though LIBDIR defaults to /lib/. If LIBDIR is overridden for the make invocation, install shared libraries to whatever is specified as LIBDIR. Closes: https://github.com/ibm-s390-tools/s390-tools/issues/98 Signed-off-by: Ingo Franzki Acked-by: Jan Höppner Signed-off-by: Jan Höppner --- common.mak | 9 ++++++++- libekmfweb/Makefile | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common.mak b/common.mak index 1577dace..62e2d7f6 100644 --- a/common.mak +++ b/common.mak @@ -176,11 +176,18 @@ SYSTEMDSYSTEMUNITDIR = USRINCLUDEDIR = $(INSTALLDIR)/usr/include ZKEYKMSPLUGINDIR = $(USRLIB64DIR)/zkey +ifeq ($(LIBDIR),$(INSTALLDIR)/lib) +SOINSTALLDIR = $(USRLIB64DIR) +else +SOINSTALLDIR = $(LIBDIR) +endif + INSTDIRS = $(USRSBINDIR) $(USRBINDIR) $(BINDIR) $(LIBDIR) $(MANDIR) \ $(SYSCONFDIR) $(SYSCONFDIR)/sysconfig \ $(TOOLS_LIBDIR) $(TOOLS_DATADIR) \ $(ZFCPDUMP_DIR) $(SYSTEMDSYSTEMUNITDIR) \ - $(USRLIB64DIR) $(USRINCLUDEDIR) $(ZKEYKMSPLUGINDIR) + $(USRLIB64DIR) $(USRINCLUDEDIR) $(ZKEYKMSPLUGINDIR) \ + $(SOINSTALLDIR) OWNER = $(shell id -un) GROUP = $(shell id -gn) export INSTALLDIR BINDIR LIBDIR USRLIB64DIR MANDIR OWNER GROUP diff --git a/libekmfweb/Makefile b/libekmfweb/Makefile index 07d64e0f..5d0b1b92 100644 --- a/libekmfweb/Makefile +++ b/libekmfweb/Makefile @@ -77,9 +77,9 @@ libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o ln -srf libekmfweb.so.$(VERSION) libekmfweb.so install-libekmfweb.so.$(VERSION): libekmfweb.so.$(VERSION) - $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) - ln -srf $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERM) - ln -srf $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so + $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) + ln -srf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERM) + ln -srf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so $(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(rootdir)include/ekmfweb/ekmfweb.h $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb