diff options
Diffstat (limited to 'main/s390-tools/0500-remove-lib64.patch')
| -rw-r--r-- | main/s390-tools/0500-remove-lib64.patch | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/main/s390-tools/0500-remove-lib64.patch b/main/s390-tools/0500-remove-lib64.patch index 281115d70d5..d1e5497cc29 100644 --- a/main/s390-tools/0500-remove-lib64.patch +++ b/main/s390-tools/0500-remove-lib64.patch @@ -1,41 +1,16 @@ +diff --git a/common.mak b/common.mak +index 78c678e..ba7cbb4 100644 --- a/common.mak +++ b/common.mak -@@ -168,7 +168,7 @@ USRSBINDIR = $(INSTALLDIR)/usr/sbin - USRBINDIR = $(INSTALLDIR)/usr/bin +@@ -181,7 +181,7 @@ USRBINDIR = $(INSTALLDIR)/usr/bin BINDIR = $(INSTALLDIR)/sbin LIBDIR = $(INSTALLDIR)/lib + USRLIBDIR = $(INSTALLDIR)/usr/lib -USRLIB64DIR = $(INSTALLDIR)/usr/lib64 -+USRLIBDIR = $(INSTALLDIR)/usr/lib ++USRLIB64DIR = $(INSTALLDIR)/usr/lib SYSCONFDIR = $(INSTALLDIR)/etc MANDIR = $(INSTALLDIR)/usr/share/man VARDIR = $(INSTALLDIR)/var -@@ -179,10 +179,10 @@ ZFCPDUMP_DIR = $(TOOLS_LIBDIR)/zfcpdu - # for SYSTEMDSYSTEMUNITDIR (e.g. /lib/systemd/system) - SYSTEMDSYSTEMUNITDIR = - USRINCLUDEDIR = $(INSTALLDIR)/usr/include --ZKEYKMSPLUGINDIR = $(USRLIB64DIR)/zkey -+ZKEYKMSPLUGINDIR = $(USRLIBDIR)/zkey - - ifeq ($(LIBDIR),$(INSTALLDIR)/lib) --SOINSTALLDIR = $(USRLIB64DIR) -+SOINSTALLDIR = $(USRLIBDIR) - else - SOINSTALLDIR = $(LIBDIR) - endif -@@ -191,11 +191,11 @@ INSTDIRS = $(USRSBINDIR) $(USRBIN - $(SYSCONFDIR) $(SYSCONFDIR)/sysconfig \ - $(TOOLS_LIBDIR) $(TOOLS_DATADIR) \ - $(ZFCPDUMP_DIR) $(SYSTEMDSYSTEMUNITDIR) \ -- $(USRLIB64DIR) $(USRINCLUDEDIR) $(ZKEYKMSPLUGINDIR) \ -+ $(USRLIBDIR) $(USRINCLUDEDIR) $(ZKEYKMSPLUGINDIR) \ - $(SOINSTALLDIR) - OWNER = $(shell id -un) - GROUP = $(shell id -gn) --export INSTALLDIR BINDIR LIBDIR USRLIB64DIR MANDIR OWNER GROUP -+export INSTALLDIR BINDIR LIBDIR USRLIBDIR MANDIR OWNER GROUP - - # Special defines for zfcpdump - ZFCPDUMP_IMAGE = zfcpdump-image --- a/genprotimg/src/Makefile +++ b/genprotimg/src/Makefile @@ -43,7 +43,7 @@ LIBCRYPTO_LIBS := $(shell pkg-config --s |