001-fix-install.patch 2.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. Index: libp11-0.4.1/src/Makefile.am
  2. ===================================================================
  3. --- libp11-0.4.1.orig/src/Makefile.am
  4. +++ libp11-0.4.1/src/Makefile.am
  5. @@ -36,12 +36,6 @@ pkcs11_la_LIBADD = $(libp11_la_OBJECTS)
  6. pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -shrext $(SHARED_EXT) \
  7. -avoid-version -export-symbols "$(srcdir)/pkcs11.exports"
  8. -# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
  9. -check-local: $(LTLIBRARIES)
  10. - cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
  11. -install-exec-hook:
  12. - cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
  13. -
  14. if WIN32
  15. # def file required for MS users to build library
  16. mylibdir=$(libdir)
  17. Index: libp11-0.4.1/src/Makefile.in
  18. ===================================================================
  19. --- libp11-0.4.1.orig/src/Makefile.in
  20. +++ libp11-0.4.1/src/Makefile.in
  21. @@ -839,7 +839,7 @@ distdir: $(DISTFILES)
  22. fi; \
  23. done
  24. check-am: all-am
  25. - $(MAKE) $(AM_MAKEFLAGS) check-local
  26. + $(MAKE) $(AM_MAKEFLAGS)
  27. check: check-am
  28. all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
  29. installdirs:
  30. @@ -910,7 +910,7 @@ install-dvi-am:
  31. install-exec-am: install-libLTLIBRARIES
  32. @$(NORMAL_INSTALL)
  33. - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  34. + $(MAKE) $(AM_MAKEFLAGS)
  35. install-html: install-html-am
  36. install-html-am:
  37. @@ -955,7 +955,7 @@ uninstall-am: uninstall-enginesLTLIBRARI
  38. .MAKE: all check-am install-am install-exec-am install-strip
  39. -.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
  40. +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
  41. clean-enginesLTLIBRARIES clean-generic clean-libLTLIBRARIES \
  42. clean-libtool cscopelist-am ctags ctags-am distclean \
  43. distclean-compile distclean-generic distclean-hdr \
  44. @@ -963,7 +963,7 @@ uninstall-am: uninstall-enginesLTLIBRARI
  45. html-am info info-am install install-am install-data \
  46. install-data-am install-dvi install-dvi-am \
  47. install-enginesLTLIBRARIES install-exec install-exec-am \
  48. - install-exec-hook install-html install-html-am \
  49. + install-html install-html-am \
  50. install-includeHEADERS install-info install-info-am \
  51. install-libLTLIBRARIES install-man install-mylibDATA \
  52. install-pdf install-pdf-am install-pkgconfigDATA install-ps \
  53. @@ -979,11 +979,6 @@ uninstall-am: uninstall-enginesLTLIBRARI
  54. $(srcdir)/config.h.in $(srcdir)/config.h.in~
  55. -# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
  56. -check-local: $(LTLIBRARIES)
  57. - cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
  58. -install-exec-hook:
  59. - cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
  60. @WIN32_TRUE@.libs/@WIN_LIBPREFIX@p11-@LIBP11_LT_OLDEST@.dll.def: libp11.la
  61. .rc.lo: