diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-08-01 23:15:50 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-08-02 00:55:46 +0200 |
| commit | 66c2eb8b802c78dc9050779601e356a2f20cefe8 (patch) | |
| tree | fbb1d0ce394df26296b8acfeff587f8bf238b17d /Configurations/unix-Makefile.tmpl | |
| parent | 255af26c5d8039ee009a0ee718fbdc4023d045ec (diff) | |
All of ssldirs installation should be done by the install_ssldirs target
The Unix build file template didn't do that quite right.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 3caa216c8c..9feb4b1bbc 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -336,6 +336,7 @@ uninstall_docs: uninstall_man_docs uninstall_html_docs install_ssldirs: @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/private + @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/misc @set -e; for x in dummy $(MISC_SCRIPTS); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ @@ -489,7 +490,6 @@ install_runtime: @ : {- output_off() if windowsdll(); "" -} @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) @ : {- output_on() if windowsdll(); "" -} - @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/misc @echo "*** Installing runtime files" @set -e; for s in dummy $(INSTALL_SHLIBS); do \ if [ "$$s" = "dummy" ]; then continue; fi; \ @@ -543,13 +543,6 @@ uninstall_runtime: echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done - @set -e; for x in dummy $(MISC_SCRIPTS); \ - do \ - if [ "$$x" = "dummy" ]; then continue; fi; \ - fn=`basename $$x`; \ - echo "$(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \ - $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \ - done @ : {- output_off() unless windowsdll(); "" -} @set -e; for s in dummy $(INSTALL_SHLIBS); do \ if [ "$$s" = "dummy" ]; then continue; fi; \ @@ -558,9 +551,7 @@ uninstall_runtime: $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done @ : {- output_on() unless windowsdll(); "" -} - $(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin - -$(RMDIR) $(DESTDIR)$(OPENSSLDIR)/misc # A method to extract all names from a .pod file # The first sed extracts everything between "=head1 NAME" and the next =head1 |