From 5f94746fa476150b0279d980991fbdf19eaa538d Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 23 May 2016 15:51:19 +0200 Subject: [PATCH] Make sure tsget.pl and c_rehash.pl get installed on VMS and Windows. Reviewed-by: Rich Salz --- Configurations/descrip.mms.tmpl | 3 ++- Configurations/windows-makefile.tmpl | 4 ++++ VMS/openssl_utils.com | 5 ++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 7c4715d631..752c5c3177 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -348,7 +348,8 @@ install_runtime : check_INSTALLTOP @ ! Install scripts - CREATE/DIR ossl_installroot:[EXE] COPY/PROT=W:RE [.APPS]CA.pl ossl_installroot:[EXE] - COPY/PROT=W:RE [.TOOLS]c_rehash. ossl_installroot:[EXE]c_rehash.pl + COPY/PROT=W:RE [.APPS]tsget.pl ossl_installroot:[EXE] + COPY/PROT=W:RE [.TOOLS]c_rehash.pl ossl_installroot:[EXE] @ ! {- output_on() if $disabled{apps}; "" -} @ ! Install configuration file - CREATE/DIR ossl_dataroot:[000000] diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 258421d4f3..ecb0d4cfff 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -241,6 +241,10 @@ install_runtime: "$(DESTDIR)$(INSTALLTOP)\bin" @$(PERL) $(SRCDIR)\util\copy.pl $(PROGRAMPDBS) \ "$(DESTDIR)$(INSTALLTOP)\bin" + @$(PERL) $(SRCDIR)\util\copy.pl $(SCRIPTS) \ + "$(DESTDIR)$(INSTALLTOP)\bin" + @$(PERL) $(SRCDIR)\util\copy.pl tools\c_rehash.pl \ + "$(DESTDIR)$(INSTALLTOP)\bin" uninstall_runtime: diff --git a/VMS/openssl_utils.com b/VMS/openssl_utils.com index b9dea722f3..09c75d973c 100644 --- a/VMS/openssl_utils.com +++ b/VMS/openssl_utils.com @@ -5,8 +5,7 @@ $ OPENSSL :== $OSSL$EXE:OPENSSL $ $ IF F$SYMBOL(PERL) .EQS. "STRING" $ THEN -$ OSSLCA :== 'PERL' OSSL$EXE:CA.pl -$ OSSLREHASH :== 'PERL' OSSL$EXE:c_rehash.pl +$ C_REHASH :== 'PERL' OSSL$EXE:c_rehash.pl $ ELSE -$ WRITE SYS$ERROR "NOTE: no perl => no OSSLCA or OSSLREHASH" +$ WRITE SYS$ERROR "NOTE: no perl => no C_REHASH" $ ENDIF -- GitLab