blob: 315f589966e311f1577e1d29c503543621d610d0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,16 +66,6 @@ libpkcs11_la_CFLAGS = $(pkcs11_la_CFLAGS
libpkcs11_la_LIBADD = $(pkcs11_la_LIBADD)
endif
-# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
-check-local: $(LTLIBRARIES)
- cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
-
-install-exec-hook:
- cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
-if LIBP11_OSSL_PROVIDER
- cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
-endif
-
if WIN32
# def file required for MS users to build library
mylibdir=$(libdir)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1057,7 +1057,7 @@ distdir-am: $(DISTFILES)
fi; \
done
check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) check-local
+ $(MAKE) $(AM_MAKEFLAGS)
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
install-enginesexecLTLIBRARIES: install-libLTLIBRARIES
@@ -1158,7 +1158,7 @@ install-dvi-am:
install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES \
install-providersexecLTLIBRARIES
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ $(MAKE) $(AM_MAKEFLAGS)
install-html: install-html-am
install-html-am:
@@ -1228,7 +1228,7 @@ uninstall-am: uninstall-enginesexecLTLIB
.MAKE: all check-am install-am install-exec-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \
- check-local clean clean-enginesexecLTLIBRARIES clean-generic \
+ clean clean-enginesexecLTLIBRARIES clean-generic \
clean-libLTLIBRARIES clean-libtool \
clean-providersexecLTLIBRARIES cscopelist-am ctags ctags-am \
distclean distclean-compile distclean-generic distclean-hdr \
@@ -1253,13 +1253,6 @@ uninstall-am: uninstall-enginesexecLTLIB
$(srcdir)/config.h.in $(srcdir)/config.h.in~
-# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
-check-local: $(LTLIBRARIES)
- cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
-
-install-exec-hook:
- cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
-@LIBP11_OSSL_PROVIDER_TRUE@ cd '$(DESTDIR)$(providersexecdir)' && $(LN_S) -f pkcs11prov$(SHARED_EXT) libpkcs11$(SHARED_EXT)
@WIN32_TRUE@.libs/@WIN_LIBPREFIX@p11-@LIBP11_LT_OLDEST@.dll.def: libp11.la
.rc.lo:
$(LTRCCOMPILE) -i "$<" -o "$@"
|
