summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-19 10:38:15 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-19 11:12:33 +0100
commit8be7bdb5c613fbf5904f04897f85d17172ad6f7a (patch)
treef3355f27c643221e887f69698ed3aa863cc98edb /Configurations
parentRethink the uplink / applink story (diff)
downloadopenssl-8be7bdb5c613fbf5904f04897f85d17172ad6f7a.tar.xz
openssl-8be7bdb5c613fbf5904f04897f85d17172ad6f7a.zip
Unified - do a better job when uninstalling
Some directories weren't removed. Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/unix-Makefile.tmpl5
1 files changed, 4 insertions, 1 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 693b2fd419..175718c22a 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
@@ -469,6 +471,7 @@ UNINSTALL_DOCS=\
$(RM) $$top/man$$SEC/$$n$$suf; \
fi; \
done; \
+ ( $(RMDIR) $$top/man$$SEC 2>/dev/null || exit 0 ); \
done; \
done