The branch master has been updated
via f0c93a8593015f589519d98ab792eadae977a399 (commit)
via 8be7bdb5c613fbf5904f04897f85d17172ad6f7a (commit)
from 3a55c92bbad0b720c9a3d7a56fa3c351b65a89ee (commit)
- Log -----------------------------------------------------------------
commit f0c93a8593015f589519d98ab792eadae977a399
Author: Richard Levitte <[email protected]>
Date: Fri Feb 19 10:39:12 2016 +0100
Unified - don't install the ossltest engine
This is done with a simple file name comparison. We could think of
something more elegant in the future.
Reviewed-by: Andy Polyakov <[email protected]>
commit 8be7bdb5c613fbf5904f04897f85d17172ad6f7a
Author: Richard Levitte <[email protected]>
Date: Fri Feb 19 10:38:15 2016 +0100
Unified - do a better job when uninstalling
Some directories weren't removed.
Reviewed-by: Andy Polyakov <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl
b/Configurations/unix-Makefile.tmpl
index 693b2fd..d5a108e 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -87,7 +87,8 @@ ENGINESDIR={- use File::Spec::Functions;
catdir($prefix,$libdir,"engines") -}
MANDIR=$(INSTALLTOP)/share/man
-HTMLDIR=$(INSTALLTOP)/share/doc/$(BASENAME)/html
+DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
+HTMLDIR=$(DOCDIR)/html
# MANSUFFIX is for the benefit of anyone who may want to have a suffix
# appended after the manpage file section number. "ssl" is popular,
@@ -211,6 +212,7 @@ uninstall_sw: uninstall_dev uninstall_engines
uninstall_runtime
install_docs: install_man_docs install_html_docs
uninstall_docs: uninstall_man_docs uninstall_html_docs
+ $(RM) -r -v $(DESTDIR)$(DOCDIR)
install_ssldirs:
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs
@@ -310,7 +312,10 @@ install_engines:
@echo "*** Installing engines"
@set -e; for e in $(ENGINES); do \
fn=`basename $$e`; \
- echo "install $$e -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
+ if [ "$$fn" = '{- dso("ossltest") -}' ]; then \
+ continue; \
+ fi; \
+ echo "install $$e ->
$(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \
cp $$e $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \
chmod 755 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \
mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new \
@@ -321,7 +326,10 @@ uninstall_engines:
@echo "*** Uninstalling engines"
@set -e; for e in $(ENGINES); do \
fn=`basename $$e`; \
- echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
+ if [ "$$fn" = '{- dso("ossltest") -}' ]; then \
+ continue; \
+ fi; \
+ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \
$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \
done
@@ -469,6 +477,7 @@ UNINSTALL_DOCS=\
$(RM) $$top/man$$SEC/$$n$$suf; \
fi; \
done; \
+ ( $(RMDIR) $$top/man$$SEC 2>/dev/null || exit 0 ); \
done; \
done
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
