generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename INSTALL_PREFIX to DESTDIR, remove option --install_prefix

Browse Source 
INSTALL_PREFIX is a confusing name, as there's also --prefix.
Instead, tag along with the rest of the open source world and adopt
the Makefile variable DESTDIR to designate the desired staging
directory.

The Configure option --install_prefix is removed, the only way to
designate a staging directory is with the Makefile variable (this is
also implemented for VMS' descrip.mms et al).

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte
2016-02-12 21:14:03 +01:00
parent c619e81011
commit 3c65577f1a
14 changed files with 233 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@@ -4,6 +4,12 @@
Changes between 1.0.2f and 1.1.0 [xx XXX xxxx] Changes between 1.0.2f and 1.1.0 [xx XXX xxxx]
*) The INSTALL_PREFIX Makefile variable has been renamed to
DESTDIR. That makes for less confusion on what this variable
is for. Also, the configuration option --install_prefix is
removed.
[Richard Levitte]
*) Heartbeat for TLS has been removed and is disabled by default *) Heartbeat for TLS has been removed and is disabled by default
for DTLS; configure with enable-heartbeats. Code that uses the for DTLS; configure with enable-heartbeats. Code that uses the
old #define's might need to be updated. old #define's might need to be updated.

24
Configurations/descrip.mms.tmpl
View File

@@ -106,15 +106,13 @@ PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } grep { !m|^\[\.test\]| } @{$uni
TESTPROGS={- join(", ", map { "-\n\t".$_.".EXE" } grep { m|^\[\.test\]| } @{$unified_info{programs}}) -} TESTPROGS={- join(", ", map { "-\n\t".$_.".EXE" } grep { m|^\[\.test\]| } @{$unified_info{programs}}) -}
SCRIPTS={- join(", ", map { "-\n\t".$_ } @{$unified_info{scripts}}) -} SCRIPTS={- join(", ", map { "-\n\t".$_ } @{$unified_info{scripts}}) -}
# INSTALL_PREFIX is for package builders so that they can configure for, say, # DESTDIR is for package builders so that they can configure for, say,
# SYS$COMMON:[OPENSSL] and yet have everything installed in STAGING:[USER]. # SYS$COMMON:[OPENSSL] and yet have everything installed in STAGING:[USER].
# In that case, configure with --prefix=SYS$COMMON:[OPENSSL] and then run # In that case, configure with --prefix=SYS$COMMON:[OPENSSL] and then run
# MMS with /MACROS=(INSTALL_PREFIX=STAGING:[USER]). The result will end # MMS with /MACROS=(DESTDIR=STAGING:[USER]). The result will end up in
# up in STAGING:[USER.OPENSSL]. # STAGING:[USER.OPENSSL].
# Note that INSTALL_PREFIX can also be given at configuration time, with
# --install_prefix.
# Normally it is left empty. # Normally it is left empty.
INSTALL_PREFIX={- $config{install_prefix} -} DESTDIR=
# Do not edit this manually. Use Configure --prefix=DIR to change this! # Do not edit this manually. Use Configure --prefix=DIR to change this!
INSTALLTOP={- catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL-\$(MAJOR).\$(MINOR)]" -} INSTALLTOP={- catdir($config{prefix}) || "SYS\$COMMON:[OPENSSL-\$(MAJOR).\$(MINOR)]" -}
@@ -160,7 +158,7 @@ NODEBUG=@
$(NODEBUG) internal_inc3 = F$PARSE("{- catdir($config{sourcedir},"[.crypto.include.internal]") -}","A.;",,,"SYNTAX_ONLY") - "A.;" $(NODEBUG) internal_inc3 = F$PARSE("{- catdir($config{sourcedir},"[.crypto.include.internal]") -}","A.;",,,"SYNTAX_ONLY") - "A.;"
$(NODEBUG) DEFINE openssl 'openssl_inc1','openssl_inc2' $(NODEBUG) DEFINE openssl 'openssl_inc1','openssl_inc2'
$(NODEBUG) DEFINE internal 'internal_inc1','internal_inc2','internal_inc3' $(NODEBUG) DEFINE internal 'internal_inc1','internal_inc2','internal_inc3'
$(NODEBUG) staging_dir = "$(INSTALL_PREFIX)" $(NODEBUG) staging_dir = "$(DESTDIR)"
$(NODEBUG) IF staging_dir .NES. "" THEN - $(NODEBUG) IF staging_dir .NES. "" THEN -
staging_dir = F$PARSE("A.;",staging_dir,"[]",,"SYNTAX_ONLY") - "A.;" staging_dir = F$PARSE("A.;",staging_dir,"[]",,"SYNTAX_ONLY") - "A.;"
$(NODEBUG) ! $(NODEBUG) !
@@ -179,7 +177,7 @@ NODEBUG=@
$(NODEBUG) ! $(NODEBUG) !
$(NODEBUG) datatop = F$PARSE("$(OPENSSLDIR)","[000000]A.;",,,"SYNTAX_ONLY") - $(NODEBUG) datatop = F$PARSE("$(OPENSSLDIR)","[000000]A.;",,,"SYNTAX_ONLY") -
- "]A.;" + ".]" - "]A.;" + ".]"
$(NODEBUG) IF "$(INSTALL_PREFIX)" .EQS. "" THEN - $(NODEBUG) IF "$(DESTDIR)" .EQS. "" THEN -
DEFINE ossl_dataroot 'datatop' DEFINE ossl_dataroot 'datatop'
$(NODEBUG) ! $(NODEBUG) !
$(NODEBUG) ! Figure out the architecture $(NODEBUG) ! Figure out the architecture
@@ -193,7 +191,7 @@ NODEBUG=@
.LAST : .LAST :
$(NODEBUG) {- join("\n\t\$(NODEBUG) ", map { "DEASSIGN ".uc($_) } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) || "!" -} $(NODEBUG) {- join("\n\t\$(NODEBUG) ", map { "DEASSIGN ".uc($_) } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}) || "!" -}
$(NODEBUG) IF "$(INSTALL_PREFIX)" .EQS. "" THEN DEASSIGN ossl_dataroot $(NODEBUG) IF "$(DESTDIR)" .EQS. "" THEN DEASSIGN ossl_dataroot
$(NODEBUG) DEASSIGN ossl_installroot $(NODEBUG) DEASSIGN ossl_installroot
$(NODEBUG) DEASSIGN internal $(NODEBUG) DEASSIGN internal
$(NODEBUG) DEASSIGN openssl $(NODEBUG) DEASSIGN openssl
@@ -266,7 +264,7 @@ install_sw : all install_dev install_engines install_runtime install_config
@ WRITE SYS$OUTPUT "" @ WRITE SYS$OUTPUT ""
@ WRITE SYS$OUTPUT "Installation complete" @ WRITE SYS$OUTPUT "Installation complete"
@ WRITE SYS$OUTPUT "" @ WRITE SYS$OUTPUT ""
@ IF "$(INSTALL_PREFIX)" .NES. "" THEN EXIT 1 @ IF "$(DESTDIR)" .NES. "" THEN EXIT 1
@ WRITE SYS$OUTPUT "Run @$(INSTALLTOP)openssl_startup to set up logical names" @ WRITE SYS$OUTPUT "Run @$(INSTALLTOP)openssl_startup to set up logical names"
@ WRITE SYS$OUTPUT "then run @$(INSTALLTOP)openssl_setup to define commands" @ WRITE SYS$OUTPUT "then run @$(INSTALLTOP)openssl_setup to define commands"
@ WRITE SYS$OUTPUT "" @ WRITE SYS$OUTPUT ""
@@ -316,10 +314,10 @@ install_engines : check_INSTALLTOP
install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - install_config : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
check_INSTALLTOP check_INSTALLTOP
IF "$(INSTALL_PREFIX)" .EQS. "" THEN - IF "$(DESTDIR)" .EQS. "" THEN -
IF F$SEARCH("OSSL_DATAROOT:[000000]CERTS.DIR;1") .EQS. "" THEN - IF F$SEARCH("OSSL_DATAROOT:[000000]CERTS.DIR;1") .EQS. "" THEN -
CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[CERTS] CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[CERTS]
IF "$(INSTALL_PREFIX)" .EQS. "" THEN - IF "$(DESTDIR)" .EQS. "" THEN -
IF F$SEARCH("OSSL_DATAROOT:[000000]PRIVATE.DIR;1") .EQS. "" THEN - IF F$SEARCH("OSSL_DATAROOT:[000000]PRIVATE.DIR;1") .EQS. "" THEN -
CREATE/DIR/PROT=(S:RWED,O:RWE,G:,W:) OSSL_DATAROOT:[PRIVATE] CREATE/DIR/PROT=(S:RWED,O:RWE,G:,W:) OSSL_DATAROOT:[PRIVATE]
CREATE/DIR ossl_installroot:[SYS$STARTUP] CREATE/DIR ossl_installroot:[SYS$STARTUP]
@@ -388,7 +386,7 @@ copy-certs :
debug_logicals : debug_logicals :
SH LOGICAL/PROC openssl,internal,ossl_installroot SH LOGICAL/PROC openssl,internal,ossl_installroot
IF "$(INSTALL_PREFIX)" .EQS. "" THEN - IF "$(DESTDIR)" .EQS. "" THEN -
SH LOGICAL/PROC ossl_dataroot SH LOGICAL/PROC ossl_dataroot
# Building targets ################################################### # Building targets ###################################################

198
Configurations/unix-Makefile.tmpl
View File

@@ -42,10 +42,10 @@ MISC_SCRIPTS=$(SRCDIR)/tools/c_hash $(SRCDIR)/tools/c_info \
$(SRCDIR)/tools/c_issuer $(SRCDIR)/tools/c_name \ $(SRCDIR)/tools/c_issuer $(SRCDIR)/tools/c_name \
$(BLDDIR)/apps/CA.pl $(SRCDIR)/apps/tsget $(BLDDIR)/apps/CA.pl $(SRCDIR)/apps/tsget
# INSTALL_PREFIX is for package builders so that they can configure # DESTDIR is for package builders so that they can configure for, say,
# for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/. # /usr/ and yet have everything installed to /tmp/somedir/usr/.
# Normally it is left empty. # Normally it is left empty.
INSTALL_PREFIX={- $config{install_prefix} -} DESTDIR=
# Do not edit these manually. Use Configure with --prefix or --openssldir # Do not edit these manually. Use Configure with --prefix or --openssldir
# to change this! Short explanation in the top comment in Configure # to change this! Short explanation in the top comment in Configure
@@ -198,184 +198,184 @@ uninstall_docs: uninstall_man_docs uninstall_html_docs
install_dev: install_dev:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@echo "*** Installing development files" @echo "*** Installing development files"
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl
@set -e; for i in $(SRCDIR)/include/openssl/*.h \ @set -e; for i in $(SRCDIR)/include/openssl/*.h \
$(BLDDIR)/include/openssl/*.h; do \ $(BLDDIR)/include/openssl/*.h; do \
fn=`basename $$i`; \ fn=`basename $$i`; \
echo "install $$i -> $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$fn"; \ echo "install $$i -> $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$fn; \ cp $$i $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$fn; \ chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
done done
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)
@set -e; for l in $(LIBS); do \ @set -e; for l in $(LIBS); do \
fn=`basename $$l`; \ fn=`basename $$l`; \
echo "install $$l -> $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ echo "install $$l -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \
cp $$l $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \ cp $$l $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \
$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \ $(RANLIB) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \ chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.new \ mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \
done done
@ : {- output_off() if $config{no_shared}; "" -} @ : {- output_off() if $config{no_shared}; "" -}
@set -e; for s in $(SHLIBS); do \ @set -e; for s in $(SHLIBS); do \
fn=`basename $$s`; \ fn=`basename $$s`; \
echo "install $$s -> $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ echo "install $$s -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \
cp $$s $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \ cp $$s $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \ chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.new \ mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \
if [ "$(SHLIB_EXT)" != "$(SHLIB_EXT_SIMPLE)" ]; then \ if [ "$(SHLIB_EXT)" != "$(SHLIB_EXT_SIMPLE)" ]; then \
echo "link $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn2 -> $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ echo "link $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2 -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \
fn2=`basename $$fn $(SHLIB_EXT)`$(SHLIB_EXT_SIMPLE); \ fn2=`basename $$fn $(SHLIB_EXT)`$(SHLIB_EXT_SIMPLE); \
ln -sf $$fn $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \ ln -sf $$fn $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \
fi; \ fi; \
: {- output_off() unless windowsdll(); "" -}; \ : {- output_off() unless windowsdll(); "" -}; \
echo "install $$s.a -> $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.a"; \ echo "install $$s.a -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a"; \
cp $$s.a $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new; \ cp $$s.a $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new; \ chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new \ mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a.new \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.a; \ $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a; \
: {- output_on() -}; \ : {- output_on() -}; \
done done
@ : {- output_on() -} @ : {- output_on() -}
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@echo "install libcrypto.pc -> $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc" @echo "install libcrypto.pc -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"
@cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig @cp libcrypto.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc @chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
@echo "install libssl.pc -> $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc" @echo "install libssl.pc -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc"
@cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig @cp libssl.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc @chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
@echo "install openssl.pc -> $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc" @echo "install openssl.pc -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc"
@cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig @cp openssl.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
@chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc @chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
uninstall_dev: uninstall_dev:
@echo "*** Uninstalling development files" @echo "*** Uninstalling development files"
@set -e; for i in $(SRCDIR)/include/openssl/*.h \ @set -e; for i in $(SRCDIR)/include/openssl/*.h \
$(BLDDIR)/include/openssl/*.h; do \ $(BLDDIR)/include/openssl/*.h; do \
fn=`basename $$i`; \ fn=`basename $$i`; \
echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$fn; \ $(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
done done
@set -e; for l in $(LIBS); do \ @set -e; for l in $(LIBS); do \
fn=`basename $$l`; \ fn=`basename $$l`; \
echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \
done done
@set -e; for s in $(SHLIBS); do \ @set -e; for s in $(SHLIBS); do \
fn=`basename $$s`; \ fn=`basename $$s`; \
if [ "$(SHLIB_EXT)" != "$(SHLIB_EXT_SIMPLE)" ]; then \ if [ "$(SHLIB_EXT)" != "$(SHLIB_EXT_SIMPLE)" ]; then \
fn2=`basename $$fn $(SHLIB_EXT)`$(SHLIB_EXT_SIMPLE); \ fn2=`basename $$fn $(SHLIB_EXT)`$(SHLIB_EXT_SIMPLE); \
echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn2"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2"; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \
fi; \ fi; \
echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \
: {- output_off() unless windowsdll(); "" -}; \ : {- output_off() unless windowsdll(); "" -}; \
echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.a"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a"; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$fn.a; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.a; \
: {- output_on() -}; \ : {- output_on() -}; \
done done
@echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc" @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc"
@$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
@echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc" @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc"
@$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
@echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc" @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc"
@$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
install_engines: install_engines:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/
@echo "*** Installing engines" @echo "*** Installing engines"
@set -e; for e in $(ENGINES); do \ @set -e; for e in $(ENGINES); do \
fn=`basename $$e`; \ fn=`basename $$e`; \
echo "install $$e -> $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn"; \ echo "install $$e -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
cp $$e $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \ cp $$e $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \
chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \ chmod 755 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new \ mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \ $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \
done done
uninstall_engines: uninstall_engines:
@echo "*** Uninstalling engines" @echo "*** Uninstalling engines"
@set -e; for e in $(ENGINES); do \ @set -e; for e in $(ENGINES); do \
fn=`basename $$e`; \ fn=`basename $$e`; \
echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \
done done
install_runtime: install_runtime:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(INSTALL_PREFIX)$(OPENSSLDIR)/misc @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/misc
@echo "*** Installing runtime files" @echo "*** Installing runtime files"
: {- output_off() unless windowsdll(); "" -}; : {- output_off() unless windowsdll(); "" -};
@set -e; for s in $(SHLIBS); do \ @set -e; for s in $(SHLIBS); do \
fn=`basename $$i`; \ fn=`basename $$i`; \
echo "install $$s -> $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn"; \ echo "install $$s -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
cp $$s $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn.new; \ cp $$s $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn.new; \ chmod 644 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn.new \ mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \
$(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn; \ $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
done done
: {- output_on() -}; : {- output_on() -};
@set -e; for x in $(PROGRAMS); do \ @set -e; for x in $(PROGRAMS); do \
fn=`basename $$x`; \ fn=`basename $$x`; \
echo "install $$x -> $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn"; \ echo "install $$x -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
cp $$x $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn.new; \ cp $$x $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn.new; \ chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn.new \ mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \
$(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn; \ $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
done done
@set -e; for x in $(BIN_SCRIPTS); do \ @set -e; for x in $(BIN_SCRIPTS); do \
fn=`basename $$x`; \ fn=`basename $$x`; \
echo "install $$x -> $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn"; \ echo "install $$x -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
cp $$x $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn.new; \ cp $$x $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn.new; \ chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn.new \ mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \
$(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn; \ $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
done done
@set -e; for x in $(MISC_SCRIPTS); do \ @set -e; for x in $(MISC_SCRIPTS); do \
fn=`basename $$x`; \ fn=`basename $$x`; \
echo "install $$x -> $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$fn"; \ echo "install $$x -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
cp $$x $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$fn.new; \ cp $$x $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new; \
chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$fn.new; \ chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new; \
mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$fn.new \ mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new \
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$fn; \ $(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \
done done
@echo "install $(SRCDIR)/apps/openssl.cnf -> $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf" @echo "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"
@cp $(SRCDIR)/apps/openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new @cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
@chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new @chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
@mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf @mv -f $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf
uninstall_runtime: uninstall_runtime:
@echo "*** Uninstalling runtime files" @echo "*** Uninstalling runtime files"
@set -e; for x in $(PROGRAMS); \ @set -e; for x in $(PROGRAMS); \
do \ do \
fn=`basename $$x`; \ fn=`basename $$x`; \
echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
done; done;
@set -e; for x in $(BIN_SCRIPTS); \ @set -e; for x in $(BIN_SCRIPTS); \
do \ do \
fn=`basename $$x`; \ fn=`basename $$x`; \
echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
done done
@set -e; for x in $(MISC_SCRIPTS); \ @set -e; for x in $(MISC_SCRIPTS); \
do \ do \
fn=`basename $$x`; \ fn=`basename $$x`; \
echo "$(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$fn"; \ echo "$(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
$(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$fn; \ $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \
done done
: {- output_off() unless windowsdll(); "" -}; : {- output_off() unless windowsdll(); "" -};
@set -e; for s in $(SHLIBS); do \ @set -e; for s in $(SHLIBS); do \
fn=`basename $$i`; \ fn=`basename $$i`; \
echo "$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$fn; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
done done
: {- output_on() -}; : {- output_on() -};
$(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf $(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf
# A method to extract all names from a .pod file # A method to extract all names from a .pod file
# The first sed extracts everything between "=head1 NAME" and the next =head1 # The first sed extracts everything between "=head1 NAME" and the next =head1
@@ -442,7 +442,7 @@ install_man_docs:
@echo "*** Installing manpages" @echo "*** Installing manpages"
@\ @\
OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \ OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \
OUTTOP="$(INSTALL_PREFIX)$(MANDIR)"; \ OUTTOP="$(DESTDIR)$(MANDIR)"; \
GENERATE='pod2man --name=$$NAME --section=$$SEC --center=OpenSSL --release=$(VERSION)'; \ GENERATE='pod2man --name=$$NAME --section=$$SEC --center=OpenSSL --release=$(VERSION)'; \
$(PROCESS_PODS) $(PROCESS_PODS)
@@ -450,7 +450,7 @@ uninstall_man_docs:
@echo "*** Uninstalling manpages" @echo "*** Uninstalling manpages"
@\ @\
OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \ OUTSUFFIX='.$${SEC}$(MANSUFFIX)'; \
OUTTOP="$(INSTALL_PREFIX)$(MANDIR)"; \ OUTTOP="$(DESTDIR)$(MANDIR)"; \
$(UNINSTALL_DOCS) $(UNINSTALL_DOCS)
install_html_docs: install_html_docs:
@@ -458,7 +458,7 @@ install_html_docs:
@echo "*** Installing HTML manpages" @echo "*** Installing HTML manpages"
@\ @\
OUTSUFFIX='.$(HTMLSUFFIX)'; \ OUTSUFFIX='.$(HTMLSUFFIX)'; \
OUTTOP="$(INSTALL_PREFIX)$(HTMLDIR)"; \ OUTTOP="$(DESTDIR)$(HTMLDIR)"; \
GENERATE="pod2html --podroot=$(SRCDIR)/doc --htmldir=.. \ GENERATE="pod2html --podroot=$(SRCDIR)/doc --htmldir=.. \
--podpath=apps:crypto:ssl \ --podpath=apps:crypto:ssl \
| sed -e 's|href=\"http://man.he.net/man|href=\"../man|g'"; \ | sed -e 's|href=\"http://man.he.net/man|href=\"../man|g'"; \
@@ -468,7 +468,7 @@ uninstall_html_docs:
@echo "*** Uninstalling manpages" @echo "*** Uninstalling manpages"
@\ @\
OUTSUFFIX='.$(HTMLSUFFIX)'; \ OUTSUFFIX='.$(HTMLSUFFIX)'; \
OUTTOP="$(INSTALL_PREFIX)$(HTMLDIR)"; \ OUTTOP="$(DESTDIR)$(HTMLDIR)"; \
$(UNINSTALL_DOCS) $(UNINSTALL_DOCS)

9
Configure
View File

@@ -32,10 +32,6 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
# This becomes the value of OPENSSLDIR in Makefile and in C. # This becomes the value of OPENSSLDIR in Makefile and in C.
# (Default: PREFIX/ssl) # (Default: PREFIX/ssl)
# #
# --install_prefix Additional prefix for package builders (empty by
# default). This needn't be set in advance, you can
# just as well use "make INSTALL_PREFIX=/whatever install".
#
# --cross-compile-prefix Add specified prefix to binutils components. # --cross-compile-prefix Add specified prefix to binutils components.
# #
# --api One of 0.9.8, 1.0.0 or 1.1.0. Do not compile support for # --api One of 0.9.8, 1.0.0 or 1.1.0. Do not compile support for
@@ -184,7 +180,6 @@ $config{prefix}="";
$config{openssldir}=""; $config{openssldir}="";
$config{processor}=""; $config{processor}="";
$config{libdir}=""; $config{libdir}="";
$config{install_prefix}= "$ENV{'INSTALL_PREFIX'}";
$config{cross_compile_prefix}=""; $config{cross_compile_prefix}="";
$config{fipslibdir}="/usr/local/ssl/fips-2.0/lib/"; $config{fipslibdir}="/usr/local/ssl/fips-2.0/lib/";
my $nofipscanistercheck=0; my $nofipscanistercheck=0;
@@ -604,10 +599,6 @@ foreach (@argvcopy)
{ {
$config{openssldir}=$1; $config{openssldir}=$1;
} }
elsif (/^--install.prefix=(.*)$/)
{
$config{install_prefix}=$1;
}
elsif (/^--with-zlib-lib=(.*)$/) elsif (/^--with-zlib-lib=(.*)$/)
{ {
$withargs{zlib_lib}=$1; $withargs{zlib_lib}=$1;

5
INSTALL
View File

@@ -252,10 +252,9 @@
locations, but have the package installed somewhere else so that locations, but have the package installed somewhere else so that
it can easily be packaged, can use it can easily be packaged, can use
$ make INSTALL_PREFIX=/tmp/package-root install $ make DESTDIR=/tmp/package-root install
(or specify "--install_prefix=/tmp/package-root" as a configure The specified destination directory will be prepended to all
option). The specified prefix will be prepended to all
installation target filenames. installation target filenames.

142
Makefile.in
View File

@@ -21,10 +21,10 @@ SHLIB_TARGET={- $target{shared_target} -}
# and should probably not be bothered with at all. # and should probably not be bothered with at all.
HERE=. 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/. # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
# Normally it is left empty. # Normally it is left empty.
INSTALL_PREFIX={- $config{install_prefix} -} DESTDIR=
# Do not edit these manually. Use Configure with --prefix or --openssldir # Do not edit these manually. Use Configure with --prefix or --openssldir
# to change this! Short explanation in the top comment in Configure # to change this! Short explanation in the top comment in Configure
@@ -215,14 +215,14 @@ HEADER= e_os.h
# Directories created on install if they don't exist. # Directories created on install if they don't exist.
INSTALLDIRS= \ INSTALLDIRS= \
$(INSTALL_PREFIX)$(INSTALLTOP)/bin \ $(DESTDIR)$(INSTALLTOP)/bin \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines \
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \ $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ $(DESTDIR)$(INSTALLTOP)/include/openssl \
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ $(DESTDIR)$(OPENSSLDIR)/misc \
$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ $(DESTDIR)$(OPENSSLDIR)/certs \
$(INSTALL_PREFIX)$(OPENSSLDIR)/private $(DESTDIR)$(OPENSSLDIR)/private
all: Makefile build_all all: Makefile build_all
@@ -251,7 +251,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
CROSS_COMPILE='$(CROSS_COMPILE)' \ CROSS_COMPILE='$(CROSS_COMPILE)' \
PERL='$(PERL)' \ PERL='$(PERL)' \
SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \ SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \
INSTALL_PREFIX='$(INSTALL_PREFIX)' \ DESTDIR='$(DESTDIR)' \
INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \ INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \
LIBDIR='$(LIBDIR)' \ LIBDIR='$(LIBDIR)' \
DEPFLAG='$(DEPFLAG)' \ DEPFLAG='$(DEPFLAG)' \
@@ -565,18 +565,18 @@ uninstall: uninstall_sw uninstall_docs
install_sw: install_sw:
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALLDIRS) @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALLDIRS)
@set -e; for i in include/openssl/*.h; do \ @set -e; for i in include/openssl/*.h; do \
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$$i; \ (cp $$i $(DESTDIR)$(INSTALLTOP)/$$i; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$$i ); \ chmod 644 $(DESTDIR)$(INSTALLTOP)/$$i ); \
done; done;
@set -e; target=install; for dir in $(INSTALL_SUBS); do $(BUILD_CMD); done @set -e; target=install; for dir in $(INSTALL_SUBS); do $(BUILD_CMD); done
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\ @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
do \ do \
if [ -f "$$i" ]; then \ if [ -f "$$i" ]; then \
( echo installing $$i; \ ( echo installing $$i; \
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ cp $$i $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ $(RANLIB) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \ mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
fi; \ fi; \
done; done;
@set -e; if [ -n "$(SHARED_LIBS)" ]; then \ @set -e; if [ -n "$(SHARED_LIBS)" ]; then \
@@ -587,16 +587,16 @@ install_sw:
( echo installing $$i; \ ( echo installing $$i; \
if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ cp $$c $(DESTDIR)$(INSTALLTOP)/bin/$$c.new; \
chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$c.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$c.new $(DESTDIR)$(INSTALLTOP)/bin/$$c; \
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ cp $$i $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \
else \ else \
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ cp $$i $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ chmod 555 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \
fi ); \ fi ); \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \ if expr $(PLATFORM) : 'mingw' > /dev/null; then \
( case $$i in \ ( case $$i in \
@@ -604,34 +604,34 @@ install_sw:
*ssl*) i=ssleay32.dll;; \ *ssl*) i=ssleay32.dll;; \
esac; \ esac; \
echo installing $$i; \ echo installing $$i; \
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ cp $$i $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \ mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$i.new $(DESTDIR)$(INSTALLTOP)/bin/$$i ); \
fi; \ fi; \
fi; \ fi; \
done; \ done; \
( here="`pwd`"; \ ( here="`pwd`"; \
cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \ cd $(DESTDIR)$(INSTALLTOP)/$(LIBDIR); \
$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \ $(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \
if [ "$(INSTALLTOP)" != "/usr" ]; then \ if [ "$(INSTALLTOP)" != "/usr" ]; then \
echo 'OpenSSL shared libraries have been installed in:'; \ echo 'OpenSSL shared libraries have been installed in:'; \
echo ' $(INSTALLTOP)'; \ echo ' $(INSTALLTOP)'; \
fi; \ fi; \
fi fi
cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig cp libcrypto.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig cp libssl.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig cp openssl.pc $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
uninstall_sw: 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) ;\ @for i in $(LIBS) ;\
do \ do \
test -f "$$i" && \ test -f "$$i" && \
echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i && \ echo $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i && \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \
done; done;
@if [ -n "$(SHARED_LIBS)" ]; then \ @if [ -n "$(SHARED_LIBS)" ]; then \
tmp="$(SHARED_LIBS)"; \ tmp="$(SHARED_LIBS)"; \
@@ -640,28 +640,28 @@ uninstall_sw:
if [ -f "$$i" -o -f "$$i.a" ]; then \ if [ -f "$$i" -o -f "$$i.a" ]; then \
if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$c; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$c; \
echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ echo $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \
else \ else \
echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ echo $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$i; \
fi; \ fi; \
if expr $(PLATFORM) : 'mingw' > /dev/null; then \ if expr $(PLATFORM) : 'mingw' > /dev/null; then \
case $$i in \ case $$i in \
*crypto*) i=libeay32.dll;; \ *crypto*) i=libeay32.dll;; \
*ssl*) i=ssleay32.dll;; \ *ssl*) i=ssleay32.dll;; \
esac; \ esac; \
echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
fi; \ fi; \
fi; \ fi; \
done; \ done; \
fi fi
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
@target=uninstall; $(RECURSIVE_BUILD_CMD) @target=uninstall; $(RECURSIVE_BUILD_CMD)
install_html_docs: install_html_docs:
@@ -671,7 +671,7 @@ install_html_docs:
filecase=-i; \ filecase=-i; \
esac; \ esac; \
for subdir in apps crypto ssl; do \ 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 \ for i in doc/$$subdir/*.pod; do \
fn=`basename $$i .pod`; \ fn=`basename $$i .pod`; \
echo "installing html/$$fn.$(HTMLSUFFIX)"; \ echo "installing html/$$fn.$(HTMLSUFFIX)"; \
@@ -679,10 +679,10 @@ install_html_docs:
| sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \ | sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \
| pod2html --podroot=doc --htmlroot=.. --podpath=$$subdir:apps:crypto:ssl \ | pod2html --podroot=doc --htmlroot=.. --podpath=$$subdir:apps:crypto:ssl \
| sed -r 's/<!DOCTYPE.*//g' \ | sed -r 's/<!DOCTYPE.*//g' \
> $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \ > $(DESTDIR)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \
$(PERL) util/extract-names.pl < $$i | \ $(PERL) util/extract-names.pl < $$i | \
grep -v $$filecase "^$$fn\$$" | \ grep -v $$filecase "^$$fn\$$" | \
(cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \ (cd $(DESTDIR)$(HTMLDIR)/$$subdir; \
while read n; do \ while read n; do \
PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \ PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \
done); \ done); \
@@ -698,21 +698,21 @@ uninstall_html_docs:
for subdir in apps crypto ssl; do \ for subdir in apps crypto ssl; do \
for i in doc/$$subdir/*.pod; do \ for i in doc/$$subdir/*.pod; do \
fn=`basename $$i .pod`; \ fn=`basename $$i .pod`; \
$(RM) $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \ $(RM) $(DESTDIR)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \
$(PERL) util/extract-names.pl < $$i | \ $(PERL) util/extract-names.pl < $$i | \
grep -v $$filecase "^$$fn\$$" | \ grep -v $$filecase "^$$fn\$$" | \
while read n; do \ while read n; do \
$(RM) $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/"$$n".$(HTMLSUFFIX); \ $(RM) $(DESTDIR)$(HTMLDIR)/$$subdir/"$$n".$(HTMLSUFFIX); \
done; \ done; \
done; \ done; \
done done
install_docs: install_docs:
@$(PERL) $(TOP)/util/mkdir-p.pl \ @$(PERL) $(TOP)/util/mkdir-p.pl \
$(INSTALL_PREFIX)$(MANDIR)/man1 \ $(DESTDIR)$(MANDIR)/man1 \
$(INSTALL_PREFIX)$(MANDIR)/man3 \ $(DESTDIR)$(MANDIR)/man3 \
$(INSTALL_PREFIX)$(MANDIR)/man5 \ $(DESTDIR)$(MANDIR)/man5 \
$(INSTALL_PREFIX)$(MANDIR)/man7 $(DESTDIR)$(MANDIR)/man7
here="`pwd`"; \ here="`pwd`"; \
filecase=; \ filecase=; \
case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \ case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
@@ -726,11 +726,11 @@ install_docs:
pod2man \ pod2man \
--section=$$sec --center=OpenSSL \ --section=$$sec --center=OpenSSL \
--release=$(VERSION) `basename $$i`) \ --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 | \ $(PERL) util/extract-names.pl < $$i | \
(grep -v $$filecase "^$$fn\$$"; true) | \ (grep -v $$filecase "^$$fn\$$"; true) | \
(grep -v "[ ]"; true) | \ (grep -v "[ ]"; true) | \
(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ (cd $(DESTDIR)$(MANDIR)/man$$sec/; \
while read n; do \ while read n; do \
PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
done); \ done); \
@@ -743,11 +743,11 @@ install_docs:
pod2man \ pod2man \
--section=$$sec --center=OpenSSL \ --section=$$sec --center=OpenSSL \
--release=$(VERSION) `basename $$i`) \ --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 | \ $(PERL) util/extract-names.pl < $$i | \
(grep -v $$filecase "^$$fn\$$"; true) | \ (grep -v $$filecase "^$$fn\$$"; true) | \
(grep -v "[ ]"; true) | \ (grep -v "[ ]"; true) | \
(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \ (cd $(DESTDIR)$(MANDIR)/man$$sec/; \
while read n; do \ while read n; do \
PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \ PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
done); \ done); \
@@ -762,27 +762,27 @@ uninstall_docs:
for i in doc/apps/*.pod; do \ for i in doc/apps/*.pod; do \
fn=`basename $$i .pod`; \ fn=`basename $$i .pod`; \
sec=`$(PERL) util/extract-section.pl 1 < $$i`; \ sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ echo $(RM) $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(RM) $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
$(PERL) util/extract-names.pl < $$i | \ $(PERL) util/extract-names.pl < $$i | \
(grep -v $$filecase "^$$fn\$$"; true) | \ (grep -v $$filecase "^$$fn\$$"; true) | \
(grep -v "[ ]"; true) | \ (grep -v "[ ]"; true) | \
while read n; do \ while read n; do \
echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ echo $(RM) $(DESTDIR)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ $(RM) $(DESTDIR)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
done; \ done; \
done; \ done; \
for i in doc/crypto/*.pod doc/ssl/*.pod; do \ for i in doc/crypto/*.pod doc/ssl/*.pod; do \
fn=`basename $$i .pod`; \ fn=`basename $$i .pod`; \
sec=`$(PERL) util/extract-section.pl 3 < $$i`; \ sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ echo $(RM) $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \ $(RM) $(DESTDIR)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
$(PERL) util/extract-names.pl < $$i | \ $(PERL) util/extract-names.pl < $$i | \
(grep -v $$filecase "^$$fn\$$"; true) | \ (grep -v $$filecase "^$$fn\$$"; true) | \
(grep -v "[ ]"; true) | \ (grep -v "[ ]"; true) | \
while read n; do \ while read n; do \
echo $(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ echo $(RM) $(DESTDIR)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
$(RM) $(INSTALL_PREFIX)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \ $(RM) $(DESTDIR)$(MANDIR)/man$$sec/"$$n".$${sec}$(MANSUFFIX); \
done; \ done; \
done done

28
apps/Makefile.in
View File

@@ -80,33 +80,33 @@ install:
@set -e; for i in $(EXE); \ @set -e; for i in $(EXE); \
do \ do \
(echo installing $$i; \ (echo installing $$i; \
cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ cp $$i $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \ mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$i.new $(DESTDIR)$(INSTALLTOP)/bin/$$i ); \
done; done;
@set -e; for i in $(SCRIPTS); \ @set -e; for i in $(SCRIPTS); \
do \ do \
(echo installing $$i; \ (echo installing $$i; \
cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \ cp $$i $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \
chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \ chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \
mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \ mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new $(DESTDIR)$(OPENSSLDIR)/misc/$$i ); \
done done
@cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ @cp openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new; \
chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new; \ chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new; \
mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf.new $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf mv -f $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf
uninstall: uninstall:
@set -e; for i in $(EXE); \ @set -e; for i in $(EXE); \
do \ do \
echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
done; done;
@set -e; for i in $(SCRIPTS); \ @set -e; for i in $(SCRIPTS); \
do \ do \
echo $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \ echo $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
$(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \ $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
done done
$(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf $(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf
generate: openssl-vms.cnf progs.h generate: openssl-vms.cnf progs.h

4
crypto/async/Makefile.in
View File

@@ -48,8 +48,8 @@ install:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@headerlist="$(EXHEADER)"; for i in $$headerlist ; \ @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
do \ do \
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ (cp $$i $(DESTDIR)$(INSTALLTOP)/include/openssl/$$i; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/$$i ); \
done; done;
depend: depend:

2
crypto/srp/Makefile.in
View File

@@ -3,7 +3,7 @@ TOP= ../..
CC= cc CC= cc
INCLUDES= -I.. -I$(TOP) -I../../include INCLUDES= -I.. -I$(TOP) -I../../include
CFLAG=-g CFLAG=-g
INSTALL_PREFIX= DESTDIR=
OPENSSLDIR= /usr/local/ssl OPENSSLDIR= /usr/local/ssl
INSTALLTOP=/usr/local/ssl INSTALLTOP=/usr/local/ssl
AR= ar r AR= ar r

2
crypto/ts/Makefile.in
View File

@@ -6,7 +6,7 @@ TOP= ../..
CC= cc CC= cc
INCLUDES= -I.. -I../../include INCLUDES= -I.. -I../../include
CFLAG = -g CFLAG = -g
INSTALL_PREFIX= DESTDIR=
OPENSSLDIR= /usr/local/ssl OPENSSLDIR= /usr/local/ssl
INSTALLTOP=/usr/local/ssl INSTALLTOP=/usr/local/ssl
AR= ar r AR= ar r

10
engines/Makefile.in
View File

@@ -88,13 +88,13 @@ install:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@if [ -n "$(SHARED_LIBS)" ]; then \ @if [ -n "$(SHARED_LIBS)" ]; then \
set -e; \ set -e; \
$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \ $(PERL) $(TOP)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines; \
for l in $(LIBNAMES); do \ for l in $(LIBNAMES); do \
( echo installing $$l; \ ( echo installing $$l; \
pfx=lib; \ pfx=lib; \
if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
sfx=".so"; \ sfx=".so"; \
cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ cp cyg$$l.dll $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
else \ else \
case "$(CFLAGS)" in \ case "$(CFLAGS)" in \
*DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \ *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \
@@ -102,10 +102,10 @@ install:
*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
*) sfx=".bad";; \ *) sfx=".bad";; \
esac; \ esac; \
cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ cp $$pfx$$l$$sfx $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
fi; \ fi; \
chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ chmod 555 $(DESTDIR)$(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 ); \ mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
done; \ done; \
fi fi

2
openssl.spec
View File

@@ -103,7 +103,7 @@ LD_LIBRARY_PATH=`pwd` make test
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make MANDIR=/usr/man MANSUFFIX=ssl INSTALL_PREFIX="$RPM_BUILD_ROOT" install make MANDIR=/usr/man MANSUFFIX=ssl DESTDIR="$RPM_BUILD_ROOT" install
# Make backwards-compatibility symlink to ssleay # Make backwards-compatibility symlink to ssleay
ln -sf /usr/bin/openssl $RPM_BUILD_ROOT/usr/bin/ssleay ln -sf /usr/bin/openssl $RPM_BUILD_ROOT/usr/bin/ssleay

20
tools/Makefile.in
View File

@@ -23,27 +23,27 @@ install:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@for i in $(APPS) ; \ @for i in $(APPS) ; \
do \ do \
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ (cp $$i $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \ chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$i.new; \
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \ mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$i.new $(DESTDIR)$(INSTALLTOP)/bin/$$i ); \
done; done;
@for i in $(MISC_APPS) ; \ @for i in $(MISC_APPS) ; \
do \ do \
(cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \ (cp $$i $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \
chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \ chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new; \
mv -f $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \ mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$i.new $(DESTDIR)$(OPENSSLDIR)/misc/$$i ); \
done; done;
uninstall: uninstall:
@for i in $(APPS) ; \ @for i in $(APPS) ; \
do \ do \
echo $(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ echo $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
$(RM) $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$i; \
done; done;
@for i in $(MISC_APPS) ; \ @for i in $(MISC_APPS) ; \
do \ do \
echo $(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \ echo $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
$(RM) $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \ $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$i; \
done; done;
files: files:

20
util/cygwin.sh
View File

@@ -8,7 +8,7 @@
#set -x #set -x
CONFIG_OPTIONS="--prefix=/usr shared zlib no-idea no-rc5" CONFIG_OPTIONS="--prefix=/usr shared zlib no-idea no-rc5"
INSTALL_PREFIX=/tmp/install/INSTALL DESTDIR=/tmp/install/INSTALL
VERSION= VERSION=
SHLIB_VERSION_NUMBER= SHLIB_VERSION_NUMBER=
@@ -16,8 +16,8 @@ SUBVERSION=$1
function cleanup() function cleanup()
{ {
rm -rf ${INSTALL_PREFIX}/etc rm -rf ${DESTDIR}/etc
rm -rf ${INSTALL_PREFIX}/usr rm -rf ${DESTDIR}/usr
} }
function get_openssl_version() function get_openssl_version()
@@ -40,14 +40,14 @@ function get_openssl_version()
function base_install() function base_install()
{ {
mkdir -p ${INSTALL_PREFIX} mkdir -p ${DESTDIR}
cleanup cleanup
make install INSTALL_PREFIX="${INSTALL_PREFIX}" make install DESTDIR="${DESTDIR}"
} }
function doc_install() function doc_install()
{ {
DOC_DIR=${INSTALL_PREFIX}/usr/share/doc/openssl DOC_DIR=${DESTDIR}/usr/share/doc/openssl
mkdir -p ${DOC_DIR} mkdir -p ${DOC_DIR}
cp CHANGES CHANGES.SSLeay INSTALL LICENSE NEWS README ${DOC_DIR} cp CHANGES CHANGES.SSLeay INSTALL LICENSE NEWS README ${DOC_DIR}
@@ -57,7 +57,7 @@ function doc_install()
function certs_install() function certs_install()
{ {
CERTS_DIR=${INSTALL_PREFIX}/usr/ssl/certs CERTS_DIR=${DESTDIR}/usr/ssl/certs
mkdir -p ${CERTS_DIR} mkdir -p ${CERTS_DIR}
cp -rp certs/* ${CERTS_DIR} cp -rp certs/* ${CERTS_DIR}
@@ -65,7 +65,7 @@ function certs_install()
function create_cygwin_readme() function create_cygwin_readme()
{ {
README_DIR=${INSTALL_PREFIX}/usr/share/doc/Cygwin README_DIR=${DESTDIR}/usr/share/doc/Cygwin
README_FILE=${README_DIR}/openssl-${VERSION}.README README_FILE=${README_DIR}/openssl-${VERSION}.README
mkdir -p ${README_DIR} mkdir -p ${README_DIR}
@@ -81,7 +81,7 @@ function create_cygwin_readme()
function create_profile_files() function create_profile_files()
{ {
PROFILE_DIR=${INSTALL_PREFIX}/etc/profile.d PROFILE_DIR=${DESTDIR}/etc/profile.d
mkdir -p $PROFILE_DIR mkdir -p $PROFILE_DIR
cat > ${PROFILE_DIR}/openssl.sh <<- "EOF" cat > ${PROFILE_DIR}/openssl.sh <<- "EOF"
@@ -126,7 +126,7 @@ create_cygwin_readme
create_profile_files create_profile_files
cd ${INSTALL_PREFIX} cd ${DESTDIR}
chmod u+w usr/lib/engines/*.so chmod u+w usr/lib/engines/*.so
strip usr/bin/*.exe usr/bin/*.dll usr/lib/engines/*.so strip usr/bin/*.exe usr/bin/*.dll usr/lib/engines/*.so
chmod u-w usr/lib/engines/*.so chmod u-w usr/lib/engines/*.so