lede-packages-rs

git clone git://archive.git.mtrnord.blog/MTRNord/lede-packages-rs.git
Log | Files | Refs | README | LICENSE

001-fix-install.patch (2755B)


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