X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=Makefile.in;h=c269a6d20a785c14bb9cbbfb80466780e58ebbc6;hp=6c74a704a3506d6fae176e09ad0456a7c2969f46;hb=45502bfe19fb03c9f343b03fa6434ee0bece8428;hpb=8cef1212f3a8271e1d9f2b4b02720751084a1785 diff --git a/Makefile.in b/Makefile.in index 6c74a704a3..c269a6d20a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,33 +1,68 @@ ## ## Makefile for OpenSSL ## - -VERSION= -MAJOR= -MINOR= -SHLIB_VERSION_NUMBER= -SHLIB_VERSION_HISTORY= -SHLIB_MAJOR= -SHLIB_MINOR= -SHLIB_EXT= -PLATFORM=dist -OPTIONS= -CONFIGURE_ARGS= -SHLIB_TARGET= +## {- join("\n## ", @autowarntext) -} + +VERSION={- $config{version} -} +MAJOR={- $config{major} -} +MINOR={- $config{minor} -} +SHLIB_VERSION_NUMBER={- $config{shlib_version_number} -} +SHLIB_VERSION_HISTORY={- $config{shlib_version_history} -} +SHLIB_MAJOR={- $config{shlib_major} -} +SHLIB_MINOR={- $config{shlib_minor} -} +SHLIB_EXT={- $target{shared_extension} || ".so" -} +SHLIB_EXT_SIMPLE={- $target{shared_extension_simple} || ".so" -} +SHLIB_EXT_IMPORT={- $target{shared_import_extension} || "" -} +DSO_EXT={- $target{dso_extension} || ".so" -} +PLATFORM={- $config{target} -} +OPTIONS={- $config{options} -} +CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -}) +SHLIB_TARGET={- $target{shared_target} -} # HERE indicates where this Makefile lives. This can be used to indicate # where sub-Makefiles are expected to be. Currently has very limited usage, # and should probably not be bothered with at all. HERE=. -# INSTALL_PREFIX is for package builders so that they can configure +# DESTDIR is for package builders so that they can configure # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/. # Normally it is left empty. -INSTALL_PREFIX= -INSTALLTOP=/usr/local/ssl - -# Do not edit this manually. Use Configure --openssldir=DIR to change this! -OPENSSLDIR=/usr/local/ssl +DESTDIR= + +# Do not edit these manually. Use Configure with --prefix or --openssldir +# to change this! Short explanation in the top comment in Configure +INSTALLTOP={- # $prefix is used in the OPENSSLDIR perl snippet + # + our $prefix = $config{prefix} || "/usr/local"; + $prefix -} +OPENSSLDIR={- # + # The logic here is that if no --openssldir was given, + # OPENSSLDIR will get the value from $prefix plus "/ssl". + # If --openssldir was given and the value is an absolute + # path, OPENSSLDIR will get its value without change. + # If the value from --openssldir is a relative path, + # OPENSSLDIR will get $prefix with the --openssldir + # value appended as a subdirectory. + # + use File::Spec::Functions; + our $openssldir = + $config{openssldir} ? + (file_name_is_absolute($config{openssldir}) ? + $config{openssldir} + : catdir($prefix, $config{openssldir})) + : catdir($prefix, "ssl"); + $openssldir -} +LIBDIR={- # + # if $prefix/lib$target{multilib} is not an existing + # directory, then assume that it's not searched by linker + # automatically, in which case adding $target{multilib} suffix + # causes more grief than we're ready to tolerate, so don't... + our $multilib = + -d "$prefix/lib$target{multilib}" ? $target{multilib} : ""; + our $libdir = $config{libdir} || "lib$multilib"; + $libdir -} +ENGINESDIR={- use File::Spec::Functions; + catdir($prefix,$libdir,"engines") -} # NO_IDEA - Define to build without the IDEA algorithm # NO_RC4 - Define to build without the RC4 algorithm @@ -44,7 +79,7 @@ OPENSSLDIR=/usr/local/ssl # NULL encryption ciphers. # # LOCK_DEBUG - turns on lots of lock debug output :-) -# REF_CHECK - turn on some xyz_free() assertions. +# REF_DEBUG - turn on some xyz_free() assertions. # REF_PRINT - prints some stuff on structure free. # MFUNC - Make all Malloc/Free/Realloc calls call # CRYPTO_malloc/CRYPTO_free/CRYPTO_realloc which can be setup to @@ -56,23 +91,24 @@ OPENSSLDIR=/usr/local/ssl # equal 4. # PKCS1_CHECK - pkcs1 tests. -CC= cc -CFLAG= -O -DEPFLAG= -PEX_LIBS= -EX_LIBS= -EXE_EXT= -ARFLAGS= -AR=ar $(ARFLAGS) r -RANLIB= ranlib -NM= nm -PERL= perl +CROSS_COMPILE= {- $config{cross_compile_prefix} -} +CC= $(CROSS_COMPILE){- $target{cc} -} +CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}},"OPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","ENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"")) -} {- $config{cflags} -} +CFLAG_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -} +LDFLAG= {- $config{lflags} -} +PLIB_LDFLAG= {- $config{plib_lflags} -} +EX_LIBS= {- $config{ex_libs} -} +EXE_EXT= {- $target{exe_extension} -} +ARFLAGS= {- $target{arflags} -} +AR=$(CROSS_COMPILE){- $target{ar} -} $(ARFLAGS) r +RANLIB= {- $target{ranlib} -} +NM= $(CROSS_COMPILE){- $target{nm} -} +PERL= {- $config{perl} -} #RM= echo -- RM= rm -f TAR= tar TARFLAGS= --no-recursion -MAKEDEPPROG=makedepend -LIBDIR=lib +MAKEDEPPROG=$(CROSS_COMPILE){- $config{makedepprog} -} # 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 @@ -84,32 +120,33 @@ ASFLAG=$(CFLAG) # For x86 assembler: Set PROCESSOR to 386 if you want to support # the 80386. -PROCESSOR= +PROCESSOR= {- $config{processor} -} # CPUID module collects small commonly used assembler snippets -CPUID_OBJ= -BN_ASM= bn_asm.o -EC_ASM= -DES_ENC= des_enc.o fcrypt_b.o -AES_ENC= aes_core.o aes_cbc.o -BF_ENC= bf_enc.o -CAST_ENC= c_enc.o -RC4_ENC= rc4_enc.o -RC5_ENC= rc5_enc.o -MD5_ASM_OBJ= -SHA1_ASM_OBJ= -RMD160_ASM_OBJ= -WP_ASM_OBJ= -CMLL_ENC= -MODES_ASM_OBJ= -ENGINES_ASM_OBJ= -CHACHA_ENC= chacha_enc.o -POLY1305_ASM_OBJ= -PERLASM_SCHEME= +APPS_OBJ={- $target{apps_obj} -} +CPUID_OBJ= {- $target{cpuid_obj} -} +BN_ASM= {- $target{bn_obj} -} +EC_ASM= {- $target{ec_obj} -} +DES_ENC= {- $target{des_obj} -} +AES_ENC= {- $target{aes_obj} -} +BF_ENC= {- $target{bf_obj} -} +CAST_ENC= {- $target{cast_obj} -} +RC4_ENC= {- $target{rc4_obj} -} +RC5_ENC= {- $target{rc5_obj} -} +MD5_ASM_OBJ= {- $target{md5_obj} -} +SHA1_ASM_OBJ= {- $target{sha1_obj} -} +RMD160_ASM_OBJ= {- $target{rmd160_obj} -} +WP_ASM_OBJ= {- $target{wp_obj} -} +CMLL_ENC= {- $target{cmll_obj} -} +MODES_ASM_OBJ= {- $target{modes_obj} -} +PADLOCK_ASM_OBJ= {- $target{padlock_obj} -} +CHACHA_ENC= {- $target{chacha_obj} -} +POLY1305_ASM_OBJ= {- $target{poly1305_obj} -} +PERLASM_SCHEME= {- $target{perlasm_scheme} -} # Zlib stuff -ZLIB_INCLUDE= -LIBZLIB= +ZLIB_INCLUDE={- $withargs{zlib_include} -} +LIBZLIB={- $withargs{zlib_lib} -} # This is the location of fipscanister.o and friends. # The FIPS module build will place it $(INSTALLTOP)/lib @@ -118,34 +155,25 @@ LIBZLIB= # $(INSTALLTOP) for this build may be different so hard # code the path. -FIPSLIBDIR=/usr/local/ssl/$(LIBDIR)/ +FIPSLIBDIR={- $config{fipslibdir} -} # The location of the library which contains fipscanister.o # normally it will be libcrypto. If not compiling in FIPS mode # at all this is empty making it a useful test for a FIPS compile. -FIPSCANLIB= +FIPSCANLIB={- $config{fips} ? "libcrypto" : "" -} # Shared library base address. Currently only used on Windows. # -BASEADDR= +BASEADDR={- $config{baseaddr} -} -DIRS= crypto ssl engines apps test tools +DIRS= {- join(" ", @{$config{dirs}}) -} SHLIBDIRS= crypto ssl INSTALL_SUBS= engines apps tools # dirs in crypto to build -SDIRS= \ - objects \ - md2 md4 md5 sha mdc2 hmac ripemd whrlpool poly1305 \ - des aes rc2 rc4 rc5 idea bf cast camellia seed chacha modes \ - bn ec rsa dsa dh dso engine \ - buffer bio stack lhash rand err \ - evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui \ - cms pqueue ts jpake srp store cmac ct async kdf -# keep in mind that the above list is adjusted by ./Configure -# according to no-xxx arguments... +SDIRS= {- join(" ", @{$config{sdirs}}) -} # tests to perform. "alltests" is a special word indicating that all tests # should be performed. @@ -153,21 +181,35 @@ TESTS = alltests MAKEFILE= Makefile -MANDIR=$(OPENSSLDIR)/man +MANDIR=$(INSTALLTOP)/share/man MAN1=1 MAN3=3 MANSUFFIX= HTMLSUFFIX=html -HTMLDIR=$(OPENSSLDIR)/html +HTMLDIR=$(INSTALLTOP)/share/doc/$(BASENAME)/html SHELL=/bin/sh TOP= . LIBS= libcrypto.a libssl.a SHARED_CRYPTO=libcrypto$(SHLIB_EXT) SHARED_SSL=libssl$(SHLIB_EXT) -SHARED_LIBS= -SHARED_LIBS_LINK_EXTS= -SHARED_LDFLAGS= +SHARED_LIBS={- '$(SHARED_CRYPTO) $(SHARED_SSL)' if (!$config{no_shared}) -} +SHARED_CFLAG={- $target{shared_cflag} -} +SHARED_LDFLAG={- $target{shared_ldflag} + # Unlike other OSes (like Solaris, Linux, Tru64, + # IRIX) BSD run-time linkers (tested OpenBSD, NetBSD + # and FreeBSD) "demand" RPATH set on .so objects. + # Apparently application RPATH is not global and + # does not apply to .so linked with other .so. + # Problem manifests itself when libssl.so fails to + # load libcrypto.so. One can argue that we should + # engrave this into Makefile.shared rules or into + # BSD-* config lines above. Meanwhile let's try to + # be cautious and pass -rpath to linker only when + # $prefix is not /usr. + . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$| + ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -} +SHARED_RCFLAG={- $target{shared_rcflag} -} GENERAL= Makefile BASENAME= openssl @@ -177,16 +219,16 @@ HEADER= e_os.h # Directories created on install if they don't exist. INSTALLDIRS= \ - $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ - $(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 \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/private + $(DESTDIR)$(INSTALLTOP)/bin \ + $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) \ + $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines \ + $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \ + $(DESTDIR)$(INSTALLTOP)/include/openssl \ + $(DESTDIR)$(OPENSSLDIR)/misc \ + $(DESTDIR)$(OPENSSLDIR)/certs \ + $(DESTDIR)$(OPENSSLDIR)/private -all: Makefile build_all +all: Makefile build_all_but_tests # as we stick to -e, CLEARENV ensures that local variables in lower # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn @@ -207,23 +249,25 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \ # LC_ALL=C ensures that error [and other] messages are delivered in # same language for uniform treatment. BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ - CC='$(CC)' CFLAG='$(CFLAG)' \ + CC='$(CC)' CFLAG='$(CFLAG)' CFLAG_Q='$(CFLAG_Q)' \ + SHARED_CFLAG='$(SHARED_CFLAG)' \ AS='$(CC)' ASFLAG='$(CFLAG) -c' \ AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ - CROSS_COMPILE='$(CROSS_COMPILE)' \ + CROSS_COMPILE='$(CROSS_COMPILE)' \ PERL='$(PERL)' \ SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \ - INSTALL_PREFIX='$(INSTALL_PREFIX)' \ + DESTDIR='$(DESTDIR)' \ INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \ LIBDIR='$(LIBDIR)' \ - MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \ - DEPFLAG='$(DEPFLAG)' \ - MAKEDEPPROG='$(MAKEDEPPROG)' \ - SHARED_LDFLAGS='$(SHARED_LDFLAGS)' \ + SHARED_LDFLAG='$(SHARED_LDFLAG)' \ + SHARED_RCFLAG='$(SHARED_RCFLAG)' \ ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \ - SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \ - PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)' \ + SHLIB_EXT='$(SHLIB_EXT)' DSO_EXT='$(DSO_EXT)' \ + SHLIB_TARGET='$(SHLIB_TARGET)' \ + LDFLAG='$(LDFLAG)' \ + PLIB_LDFLAG='$(PLIB_LDFLAG)' EX_LIBS='$(EX_LIBS)' \ + APPS_OBJ='$(APPS_OBJ)' \ CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)' \ EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)' \ AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)' \ @@ -234,7 +278,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)' \ WP_ASM_OBJ='$(WP_ASM_OBJ)' \ MODES_ASM_OBJ='$(MODES_ASM_OBJ)' \ - ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)' \ + PADLOCK_ASM_OBJ='$(PADLOCK_ASM_OBJ)' \ CHACHA_ENC='$(CHACHA_ENC)' \ POLY1305_ASM_OBJ='$(POLY1305_ASM_OBJ)' \ PERLASM_SCHEME='$(PERLASM_SCHEME)' \ @@ -273,7 +317,8 @@ reflect: sub_all: build_all -build_all: build_libs build_apps build_tests build_tools +build_all_but_tests: build_libs build_apps build_tools +build_all: build_all_but_tests build_tests build_libs: build_libcrypto build_libssl openssl.pc @@ -318,20 +363,6 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a exit 1; \ fi -clean-shared: - @set -e; for i in $(SHLIBDIRS); do \ - if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \ - tmp="$(SHARED_LIBS_LINK_EXTS)"; \ - for j in $${tmp:-x}; do \ - ( set -x; rm -f lib$$i$$j ); \ - done; \ - fi; \ - ( set -x; rm -f lib$$i$(SHLIB_EXT) ); \ - if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ - ( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \ - fi; \ - done - link-shared: @ set -e; for i in $(SHLIBDIRS); do \ $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \ @@ -349,8 +380,26 @@ do_$(SHLIB_TARGET): LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \ LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \ LIBDEPS="$$libs $(EX_LIBS)" \ - link_a.$(SHLIB_TARGET); \ + link_shlib.$(SHLIB_TARGET); \ libs="-l$$i $$libs"; \ + case "$(PLATFORM)" in \ + Cygwin*) \ + rm -f apps/cyg$$i-$(SHLIB_MAJOR).$(SHLIB_MINOR).dll; \ + rm -f test/cyg$$i-$(SHLIB_MAJOR).$(SHLIB_MINOR).dll; \ + cp cyg$$i-$(SHLIB_MAJOR).$(SHLIB_MINOR).dll apps/; \ + cp cyg$$i-$(SHLIB_MAJOR).$(SHLIB_MINOR).dll test/; \ + ;; \ + mingw*) \ + arch=; \ + if expr $(PLATFORM) : mingw64 > /dev/null; then \ + arch=-x64; \ + fi; \ + rm -f apps/lib$$i-$(SHLIB_MAJOR)_$(SHLIB_MINOR)$$arch.dll; \ + rm -f test/lib$$i-$(SHLIB_MAJOR)_$(SHLIB_MINOR)$$arch.dll; \ + cp lib$$i-$(SHLIB_MAJOR)_$(SHLIB_MINOR)$$arch.dll apps/; \ + cp lib$$i-$(SHLIB_MAJOR)_$(SHLIB_MINOR)$$arch.dll test/; \ + ;; \ + esac; \ done libcrypto.pc: Makefile @@ -422,7 +471,7 @@ gentests: $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate ); rehash: rehash.time -rehash.time: certs build_apps +rehash.time: certs build_apps build_tools @if [ -z "$(CROSS_COMPILE)" ]; then \ (OPENSSL="`pwd`/util/opensslwrap.sh"; \ [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \ @@ -433,10 +482,10 @@ rehash.time: certs build_apps touch rehash.time; \ else :; fi -test: tests +test: files tests -tests: rehash +tests: build_tests rehash @(cd test && echo "testing..." && \ $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); @if [ -z "$(CROSS_COMPILE)" ]; then \ @@ -463,9 +512,9 @@ depend: update: generate errors ordinals depend generate: - (cd apps && $(MAKE) generate) - (cd crypto/bn && $(MAKE) generate) - (cd crypto/objects && $(MAKE) generate) + (cd apps && PERL='${PERL}' $(MAKE) generate) + (cd crypto/bn && PERL='${PERL}' $(MAKE) generate) + (cd crypto/objects && PERL='${PERL}' $(MAKE) generate) errors: $(PERL) util/ck_errf.pl -strict */*.c */*/*.c @@ -491,15 +540,13 @@ TABLE: Configure Configurations/*.conf # and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal # tar does not support the --files-from option. TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from $(TARFILE).list \ - --owner 0 --group 0 \ + --owner 0 --group 0 \ --transform 's|^|$(NAME)/|' \ -cvf - $(TARFILE).list: - find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \ - \! -name '*.so' \! -name '*.so.*' \! -name 'openssl' \ - \! -name '*test' \! -name '.#*' \! -name '*~' \! -type l \ - | sort > $(TARFILE).list + git diff --quiet HEAD + git ls-files | sort > $(TARFILE).list tar: $(TARFILE).list find . -type d -print | xargs chmod 755 @@ -514,7 +561,7 @@ tar-snap: $(TARFILE).list rm -f $(TARFILE).list ls -l $(TARFILE) -dist: +dist: $(PERL) Configure dist @$(MAKE) SDIRS='$(SDIRS)' clean @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar @@ -526,18 +573,18 @@ uninstall: uninstall_sw uninstall_docs install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALLDIRS) @set -e; for i in include/openssl/*.h; do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$$i ); \ + (cp $$i $(DESTDIR)$(INSTALLTOP)/$$i; \ + chmod 644 $(DESTDIR)$(INSTALLTOP)/$$i ); \ done; @set -e; target=install; for dir in $(INSTALL_SUBS); do $(BUILD_CMD); done @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ do \ if [ -f "$$i" ]; then \ ( echo installing $$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 ); \ + cp $$i $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ + $(RANLIB) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ + chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i ); \ fi; \ done; @set -e; if [ -n "$(SHARED_LIBS)" ]; then \ @@ -545,85 +592,101 @@ install_sw: for i in $${tmp:-x}; \ do \ if [ -f "$$i" -o -f "$$i.a" ]; then \ - ( echo installing $$i; \ - if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ - 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)/$(LIBDIR)/$$i.new; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ - else \ - 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; \ - fi ); \ - if expr $(PLATFORM) : 'mingw' > /dev/null; then \ - ( case $$i in \ - *crypto*) i=libeay32.dll;; \ - *ssl*) i=ssleay32.dll;; \ - esac; \ + case "$(PLATFORM)" in \ + Cygwin*) \ + c=`echo $$i | sed 's/^lib\(.*\)\.dll/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ + echo installing $$c; \ + cp $$c $(DESTDIR)$(INSTALLTOP)/bin/$$c.new; \ + chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$c.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$c.new $(DESTDIR)$(INSTALLTOP)/bin/$$c; \ + echo installing $$i.a; \ + cp $$i.a $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \ + chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \ + ;; \ + mingw*) \ + arch=; \ + if expr $(PLATFORM) : mingw64 > /dev/null; then \ + arch=-x64; \ + fi; \ + m=`echo $$i | sed -e 's/\.dll$$/-$(SHLIB_MAJOR)_$(SHLIB_MINOR)'"$$arch"'.dll/'`; \ + echo installing $$m; \ + cp $$m $(DESTDIR)$(INSTALLTOP)/bin/$$m.new; \ + chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$m.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$m.new $(DESTDIR)$(INSTALLTOP)/bin/$$m; \ + echo installing $$i.a; \ + cp $$i.a $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \ + chmod 555 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \ + ;; \ + *) \ echo installing $$i; \ - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ - chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \ - fi; \ + cp $$i $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ + chmod 555 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ + mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \ + ;; \ + esac; \ fi; \ done; \ ( here="`pwd`"; \ - cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \ + cd $(DESTDIR)$(INSTALLTOP)/$(LIBDIR); \ $(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \ if [ "$(INSTALLTOP)" != "/usr" ]; then \ echo 'OpenSSL shared libraries have been installed in:'; \ echo ' $(INSTALLTOP)'; \ fi; \ fi - 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 + cp libcrypto.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig + chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc + cp libssl.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig + chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc + cp openssl.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig + chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc uninstall_sw: - cd include/openssl && files=* && cd $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl && $(RM) $$files + cd include/openssl && files=* && cd $(DESTDIR)$(INSTALLTOP)/include/openssl && $(RM) $$files @for i in $(LIBS) ;\ do \ test -f "$$i" && \ - echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i && \ - $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ + echo $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i && \ + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \ done; @if [ -n "$(SHARED_LIBS)" ]; then \ tmp="$(SHARED_LIBS)"; \ for i in $${tmp:-x}; \ do \ if [ -f "$$i" -o -f "$$i.a" ]; then \ - if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ - c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ - echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ - $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ - echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ - $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ - else \ - echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ - $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ - fi; \ - if expr $(PLATFORM) : 'mingw' > /dev/null; then \ - case $$i in \ - *crypto*) i=libeay32.dll;; \ - *ssl*) i=ssleay32.dll;; \ - esac; \ - echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ - $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ - fi; \ + case "$(PLATFORM)" in \ + Cygwin*) \ + c=`echo $$i | sed 's/^lib\(.*\)\.dll/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ + echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$c; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$c; \ + echo $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \ + ;; \ + mingw*) \ + arch=; \ + if expr $(PLATFORM) : mingw64 > /dev/null; then \ + arch=-x64; \ + fi; \ + m=`echo $$i | sed -e 's/\.dll$$/-$(SHLIB_MAJOR)_$(SHLIB_MINOR)'"$$arch"'.dll/'`; \ + echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$m; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$m; \ + echo $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \ + ;; \ + *) \ + echo $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \ + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \ + ;; \ + esac; \ fi; \ done; \ fi - $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc - $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc - $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc - @target=uninstall; $(RECURSIVE_BUILD_CMD) + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc + $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc + @target=uninstall; for dir in $(INSTALL_SUBS); do $(BUILD_CMD); done install_html_docs: here="`pwd`"; \ @@ -632,7 +695,7 @@ install_html_docs: filecase=-i; \ esac; \ for subdir in apps crypto ssl; do \ - $(PERL) $(TOP)/util/mkdir-p $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \ + $(PERL) $(TOP)/util/mkdir-p $(DESTDIR)$(HTMLDIR)/$$subdir; \ for i in doc/$$subdir/*.pod; do \ fn=`basename $$i .pod`; \ echo "installing html/$$fn.$(HTMLSUFFIX)"; \ @@ -640,10 +703,10 @@ install_html_docs: | sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \ | pod2html --podroot=doc --htmlroot=.. --podpath=$$subdir:apps:crypto:ssl \ | sed -r 's/ $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \ + > $(DESTDIR)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ - (cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \ + (cd $(DESTDIR)$(HTMLDIR)/$$subdir; \ while read n; do \ PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \ done); \ @@ -659,21 +722,21 @@ uninstall_html_docs: for subdir in apps crypto ssl; do \ for i in doc/$$subdir/*.pod; do \ fn=`basename $$i .pod`; \ - $(RM) $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \ + $(RM) $(DESTDIR)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ grep -v $$filecase "^$$fn\$$" | \ while read n; do \ - $(RM) $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/"$$n".$(HTMLSUFFIX); \ + $(RM) $(DESTDIR)$(HTMLDIR)/$$subdir/"$$n".$(HTMLSUFFIX); \ done; \ done; \ done install_docs: @$(PERL) $(TOP)/util/mkdir-p.pl \ - $(INSTALL_PREFIX)$(MANDIR)/man1 \ - $(INSTALL_PREFIX)$(MANDIR)/man3 \ - $(INSTALL_PREFIX)$(MANDIR)/man5 \ - $(INSTALL_PREFIX)$(MANDIR)/man7 + $(DESTDIR)$(MANDIR)/man1 \ + $(DESTDIR)$(MANDIR)/man3 \ + $(DESTDIR)$(MANDIR)/man5 \ + $(DESTDIR)$(MANDIR)/man7 here="`pwd`"; \ filecase=; \ case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \ @@ -687,11 +750,11 @@ install_docs: pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`) \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + > $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ (grep -v $$filecase "^$$fn\$$"; true) | \ (grep -v "[ ]"; true) | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ + (cd $(DESTDIR)$(MANDIR)/man$$sec/; \ while read n; do \ PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ @@ -704,11 +767,11 @@ install_docs: pod2man \ --section=$$sec --center=OpenSSL \ --release=$(VERSION) `basename $$i`) \ - > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + > $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ (grep -v $$filecase "^$$fn\$$"; true) | \ (grep -v "[ ]"; true) | \ - (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ + (cd $(DESTDIR)$(MANDIR)/man$$sec/; \ while read n; do \ PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ done); \ @@ -723,27 +786,27 @@ uninstall_docs: for i in doc/apps/*.pod; do \ fn=`basename $$i .pod`; \ sec=`$(PERL) util/extract-section.pl 1 < $$i`; \ - echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ - $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + echo $(RM) $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + $(RM) $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ (grep -v $$filecase "^$$fn\$$"; true) | \ (grep -v "[ ]"; true) | \ while read n; do \ - echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ - $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ + echo $(RM) $(DESTDIR)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ + $(RM) $(DESTDIR)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ done; \ done; \ for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ sec=`$(PERL) util/extract-section.pl 3 < $$i`; \ - echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ - $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + echo $(RM) $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ + $(RM) $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(PERL) util/extract-names.pl < $$i | \ (grep -v $$filecase "^$$fn\$$"; true) | \ (grep -v "[ ]"; true) | \ while read n; do \ - echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ - $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ + echo $(RM) $(DESTDIR)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ + $(RM) $(DESTDIR)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ done; \ done