Commit 72a9776a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2135 

Submitted by: Mike Frysinger <vapier@gentoo.org>

Change missed references to lib to $(LIBDIR)
parent 8d39d280

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ install_sw: 
			fi; \

		done; \

		(	here="`pwd`"; \

			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \

			cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \

			$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \

		if [ "$(INSTALLTOP)" != "/usr" ]; then \

			echo 'OpenSSL shared libraries have been installed in:'; \

engines/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 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)/lib/engines; \

		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \

		for l in $(LIBNAMES); do \

			( echo installing $$l; \

			  pfx=lib; \

engines/ccgost/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -53,13 +53,13 @@ install: 
			*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \

			*) sfx=".bad";; \

			esac; \

			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx.new; \

			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \

		else \

			sfx=".so"; \

			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx.new; \

			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \

		fi; \

		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx.new; \

		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$${pfx}$(LIBNAME)$$sfx; \

		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; \

	fi



links: