Commit 6727565a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2003 

Make it possible to install OpenSSL in directories with name other
than "lib" for example "lib64". Based on patch from Jeremy Utley.
parent a0778bfa

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -814,6 +814,12 @@ 


 Changes between 0.9.8k and 0.9.8l  [xx XXX xxxx]



  *) Add support for --libdir option and LIBDIR variable in makefiles. This

     makes it possible to install openssl libraries in locations which 

     have names other than "lib", for example "/usr/lib64" which some

     systems need.

     [Steve Henson, based on patch from Jeremy Utley]



  *) Don't allow the use of leading 0x80 in OIDs. This is a violation of

     X690 8.9.12 and can produce some misleading textual output of OIDs.

     [Steve Henson, reported by Dan Kaminsky]

Configure

+8 −0
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ my $idx_arflags = $idx++; 
my $idx_multilib = $idx++;



my $prefix="";

my $libdir="";

my $openssldir="";

my $exe_ext="";

my $install_prefix="";
@@ -819,6 +820,10 @@ PROCESS_ARGS: 
				{

				$prefix=$1;

				}

			elsif (/^--libdir=(.*)$/)

				{

				$libdir=$1;

				}

			elsif (/^--openssldir=(.*)$/)

				{

				$openssldir=$1;
@@ -1031,6 +1036,8 @@ $exe_ext=".pm" if ($target =~ /vos/); 
$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");

$prefix=$openssldir if $prefix eq "";



$libdir="lib" if $libdir eq "";



$default_ranlib= &which("ranlib") or $default_ranlib="true";

$perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")

  or $perl="perl";
@@ -1460,6 +1467,7 @@ while (<IN>) 
	s/^INSTALLTOP=.*$/INSTALLTOP=$prefix/;

	s/^MULTILIB=.*$/MULTILIB=$multilib/;

	s/^OPENSSLDIR=.*$/OPENSSLDIR=$openssldir/;

	s/^LIBDIR=.*$/LIBDIR=$libdir/;

	s/^INSTALL_PREFIX=.*$/INSTALL_PREFIX=$install_prefix/;

	s/^PLATFORM=.*$/PLATFORM=$target/;

	s/^OPTIONS=.*$/OPTIONS=$options/;

Makefile.org

+24 −23
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ PERL= perl 
TAR= tar

TARFLAGS= --no-recursion

MAKEDEPPROG=makedepend

LIBDIR=lib



# We let the C compiler driver to take care of .s files. This is done in

# order to be excused from maintaining a separate set of architecture
@@ -181,7 +182,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \ 
		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\

		CROSS_COMPILE_PREFIX='$(CROSS_COMPILE_PREFIX)'	\

		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\

		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib'	\

		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'	\

		INSTALL_PREFIX='$(INSTALL_PREFIX)'		\

		INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'	\

		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
@@ -313,7 +314,7 @@ do_$(SHLIB_TARGET): 
libcrypto.pc: Makefile

	@ ( echo 'prefix=$(INSTALLTOP)'; \

	    echo 'exec_prefix=$${prefix}'; \

	    echo 'libdir=$${exec_prefix}/lib'; \

	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \

	    echo 'includedir=$${prefix}/include'; \

	    echo ''; \

	    echo 'Name: OpenSSL-libcrypto'; \
@@ -326,7 +327,7 @@ libcrypto.pc: Makefile 
libssl.pc: Makefile

	@ ( echo 'prefix=$(INSTALLTOP)'; \

	    echo 'exec_prefix=$${prefix}'; \

	    echo 'libdir=$${exec_prefix}/lib'; \

	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \

	    echo 'includedir=$${prefix}/include'; \

	    echo ''; \

	    echo 'Name: OpenSSL'; \
@@ -339,7 +340,7 @@ libssl.pc: Makefile 
openssl.pc: Makefile

	@ ( echo 'prefix=$(INSTALLTOP)'; \

	    echo 'exec_prefix=$${prefix}'; \

	    echo 'libdir=$${exec_prefix}/lib'; \

	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \

	    echo 'includedir=$${prefix}/include'; \

	    echo ''; \

	    echo 'Name: OpenSSL'; \
@@ -494,9 +495,9 @@ install: all install_docs install_sw 


install_sw:

	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \

		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \

		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \

		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \

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

		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \

		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \

		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \

		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \

		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
@@ -511,10 +512,10 @@ install_sw: 
	do \

		if [ -f "$$i" ]; then \

		(       echo installing $$i; \

			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \

			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \

		fi; \

	done;

	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \
@@ -524,17 +525,17 @@ install_sw: 
			if [ -f "$$i" -o -f "$$i.a" ]; then \

			(       echo installing $$i; \

				if [ "$(PLATFORM)" != "Cygwin" ]; then \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \

				else \

					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \

					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \

					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \

				fi ); \

				if expr $(PLATFORM) : 'mingw' > /dev/null; then \

				(	case $$i in \
@@ -558,12 +559,12 @@ install_sw: 
			sed -e '1,/^$$/d' doc/openssl-shared.txt; \

		fi; \

	fi

	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc

	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc

	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc

	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc

	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc

	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc



install_html_docs:

	here="`pwd`"; \

Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ link_a.darwin: 
	if [ -n "$$SHLIB_SOVER_NODOT" ]; then \

		SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \

	fi; \

	SHAREDFLAGS="$$SHAREDFLAGS -install_name $(INSTALLTOP)/lib/$$SHLIB$(SHLIB_EXT)"; \

	SHAREDFLAGS="$$SHAREDFLAGS -install_name $(INSTALLTOP)/$(LIBDIR)/$$SHLIB$(SHLIB_EXT)"; \

	$(LINK_SO_A)

link_app.darwin:	# is there run-path on darwin?

	$(LINK_APP)

engines/Makefile

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

				*)		sfx=".bad";;	\

				esac; \

				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/$$pfx$$l$$sfx.new; \

				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \

			  else \

				sfx=".so"; \

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

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

			  fi; \

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

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

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

		done; \

	fi

	@target=install; $(RECURSIVE_MAKE)