aboutsummaryrefslogtreecommitdiffstats
path: root/main/s390-tools/0400-busybox-compat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/s390-tools/0400-busybox-compat.patch')
-rw-r--r--main/s390-tools/0400-busybox-compat.patch27
1 files changed, 8 insertions, 19 deletions
diff --git a/main/s390-tools/0400-busybox-compat.patch b/main/s390-tools/0400-busybox-compat.patch
index 745196323a..be9f841165 100644
--- a/main/s390-tools/0400-busybox-compat.patch
+++ b/main/s390-tools/0400-busybox-compat.patch
@@ -1,6 +1,6 @@
--- a/libekmfweb/Makefile
+++ b/libekmfweb/Makefile
-@@ -73,13 +73,13 @@
+@@ -73,13 +73,13 @@ libekmfweb.so.$(VERSION): ALL_LDFLAGS +=
-Wl,-z,defs,-Bsymbolic -Wl,-soname,libekmfweb.so.$(VERM)
libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o
$(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@
@@ -10,23 +10,12 @@
+ ln -sf 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 libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION)
-+ ln -sf $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(USRLIB64DIR)/libekmfweb.so.$(VERM)
-+ ln -sf $(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) -g $(GROUP) -o $(OWNER) -m 755 libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION)
++ ln -sf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERM)
++ ln -sf $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so.$(VERSION) $(DESTDIR)$(SOINSTALLDIR)/libekmfweb.so
$(INSTALL) -d -m 770 $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $(rootdir)include/ekmfweb/ekmfweb.h $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $(rootdir)include/ekmfweb/ekmfweb.h $(DESTDIR)$(USRINCLUDEDIR)/ekmfweb
---- a/zkey/ekmfweb/Makefile
-+++ b/zkey/ekmfweb/Makefile
-@@ -48,7 +48,7 @@
- $(INSTALL) -m 644 -c zkey-ekmfweb.1 $(DESTDIR)$(MANDIR)/man1
- $(INSTALL) -d -m 755 $(DESTDIR)$(USRLIB64DIR)
- $(INSTALL) -d -m 755 $(DESTDIR)$(USRLIB64DIR)/zkey
-- $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 -T zkey-ekmfweb.so $(DESTDIR)$(USRLIB64DIR)/zkey/zkey-ekmfweb.so
-+ $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 zkey-ekmfweb.so $(DESTDIR)$(USRLIB64DIR)/zkey/zkey-ekmfweb.so
-
- clean:
- rm -f *.o zkey-ekmfweb.so install-libekmfweb.dep libekmfweb.dep