forked from brl/citadel
65 lines
3.2 KiB
Diff
65 lines
3.2 KiB
Diff
Upstream-Status: Inappropriate [configuration]
|
|
|
|
|
|
Index: openssl-1.0.2/engines/Makefile
|
|
===================================================================
|
|
--- openssl-1.0.2.orig/engines/Makefile
|
|
+++ openssl-1.0.2/engines/Makefile
|
|
@@ -107,13 +107,13 @@ install:
|
|
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
|
|
@if [ -n "$(SHARED_LIBS)" ]; then \
|
|
set -e; \
|
|
- $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
|
|
+ $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines; \
|
|
for l in $(LIBNAMES); do \
|
|
( echo installing $$l; \
|
|
pfx=lib; \
|
|
if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
|
|
sfx=".so"; \
|
|
- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \
|
|
else \
|
|
case "$(CFLAGS)" in \
|
|
*DSO_BEOS*) sfx=".so";; \
|
|
@@ -122,10 +122,10 @@ install:
|
|
*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
|
|
*) sfx=".bad";; \
|
|
esac; \
|
|
- cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
+ cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \
|
|
fi; \
|
|
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
|
|
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
|
|
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \
|
|
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx ); \
|
|
done; \
|
|
fi
|
|
@target=install; $(RECURSIVE_MAKE)
|
|
Index: openssl-1.0.2/engines/ccgost/Makefile
|
|
===================================================================
|
|
--- openssl-1.0.2.orig/engines/ccgost/Makefile
|
|
+++ openssl-1.0.2/engines/ccgost/Makefile
|
|
@@ -47,7 +47,7 @@ install:
|
|
pfx=lib; \
|
|
if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
|
|
sfx=".so"; \
|
|
- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
+ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
else \
|
|
case "$(CFLAGS)" in \
|
|
*DSO_BEOS*) sfx=".so";; \
|
|
@@ -56,10 +56,10 @@ install:
|
|
*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
|
|
*) sfx=".bad";; \
|
|
esac; \
|
|
- cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
+ cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
fi; \
|
|
- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
|
|
+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \
|
|
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx; \
|
|
fi
|
|
|
|
links:
|