99 (our $osslprefix_q = platform->osslprefix()) =~ s/\$/\\\$/;
1010
1111 our $sover_dirname = platform->shlib_version_as_filename();
12- our $osslver = sprintf "%02d%02d ", split(/\./, $config{version});
12+ our $osslver = sprintf "%02d", split(/\./, $config{version});
1313
1414 our $sourcedir = $config{sourcedir};
1515 our $builddir = $config{builddir};
110110 @cnf_defines,
111111 'OPENSSLDIR="""$(OPENSSLDIR_C)"""',
112112 'ENGINESDIR="""$(ENGINESDIR_C)"""',
113- 'MODULESDIR="""$(MODULESDIR_C)"""',
114- #'$(DEFINES)'
113+ 'MODULESDIR="""$(MODULESDIR_C)"""'
115114 )
115+ . '$(DEFINES)'
116116 . "'extradefines'";
117117 our $lib_asflags =
118118 join(' ', $target{lib_asflags} || (), @{$config{lib_asflags}},
144144 join(',', @{$target{dso_defines}}, @{$target{module_defines}},
145145 @{$config{dso_defines}}, @{$config{module_defines}},
146146 @cnf_defines,
147- #'$(DEFINES)'
148147 )
148+ . '$(DEFINES)'
149149 . "'extradefines'";
150150 our $dso_asflags =
151151 join(' ', $target{dso_asflags} || (), $target{module_asflags} || (),
180180 join(',', @{$target{bin_defines}},
181181 @{$config{bin_defines}},
182182 @cnf_defines,
183- #'$(DEFINES)'
184183 )
184+ . '$(DEFINES)'
185185 . "'extradefines'";
186186 our $bin_asflags =
187187 join(' ', $target{bin_asflags} || (),
@@ -267,6 +267,7 @@ VERBOSE=$(V)
267267VERBOSE_FAILURE=$(VF)
268268
269269VERSION={- "$config{full_version}" -}
270+ VERSION_NUMBER={- "$config{version}" -}
270271MAJOR={- $config{major} -}
271272MINOR={- $config{minor} -}
272273SHLIB_VERSION_NUMBER={- $config{shlib_version} -}
@@ -355,7 +356,7 @@ OPENSSLDIR_C={- platform->osslprefix() -}DATAROOT:[000000]
355356# Where installed ENGINE modules reside, for C
356357ENGINESDIR_C={- platform->osslprefix() -}ENGINES{- $sover_dirname.$target{pointer_size} -}:
357358# Where modules reside, for C
358- MODULESDIR_C={- platform->osslprefix() -}MODULES{- $sover_dirname.$ target{pointer_size} -}:
359+ MODULESDIR_C={- platform->osslprefix() -}MODULES{- $target{pointer_size} -}:
359360
360361##### User defined commands and flags ################################
361362
@@ -428,7 +429,9 @@ NODEBUG=@
428429 $(NODEBUG) ! them, so we create it instead. This is an unfortunate
429430 $(NODEBUG) ! necessity.
430431 $(NODEBUG) !
431- $(NODEBUG) DEFINE openssl "{- sourcedir('include/openssl') -}
432+ $(NODEBUG) openssl_inc1 = F$PARSE("[.include.openssl]","A.;",,,"syntax_only") - "A.;"
433+ $(NODEBUG) openssl_inc2 = F$PARSE("sourcetop:[include.openssl]","A.;",,,"SYNTAX_ONLY") - "A.;"
434+ $(NODEBUG) DEFINE openssl 'openssl_inc1','openssl_inc2'
432435 $(NODEBUG) !
433436 $(NODEBUG) ! Figure out the architecture
434437 $(NODEBUG) !
@@ -441,9 +444,10 @@ NODEBUG=@
441444
442445.LAST :
443446 $(NODEBUG) {- join("\n\t\$(NODEBUG) ", map { "DEASSIGN ".uc($_) } @shlibs) || "!" -}
447+ $(NODEBUG) DEASSIGN openssl
444448 $(NODEBUG) DEASSIGN ossl_dataroot
445449 $(NODEBUG) DEASSIGN ossl_installroot
446- $(NODEBUG) DEASSIGN openssl
450+ $(NODEBUG) DEASSIGN ossl_sourceroot
447451.DEFAULT :
448452 @ ! MMS cannot handle no actions...
449453
@@ -569,16 +573,18 @@ uninstall_docs : uninstall_html_docs
569573{- output_off() if $disabled{fips}; "" -}
570574install_fips : build_sw $(INSTALL_FIPSMODULECONF)
571575 @ WRITE SYS$OUTPUT "*** Installing FIPS module"
576+ - CREATE/DIR ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']
577+ - CREATE/DIR/PROT=(S:RWED,O:RWE,G:RE,W:RE) OSSL_DATAROOT:[000000]
572578 COPY/PROT=W:RE $(INSTALL_FIPSMODULES) -
573- ossl_installroot:[MODULES{- $sover_dirname.$ target{pointer_size} -}.'arch']$(FIPSMODULENAME)
579+ ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']$(FIPSMODULENAME)
574580 @ WRITE SYS$OUTPUT "*** Installing FIPS module configuration"
575581 COPY/PROT=W:RE $(INSTALL_FIPSMODULECONF) OSSL_DATAROOT:[000000]
576582
577583uninstall_fips :
578584 @ WRITE SYS$OUTPUT "*** Uninstalling FIPS module configuration"
579585 DELETE OSSL_DATAROOT:[000000]fipsmodule.cnf;*
580586 @ WRITE SYS$OUTPUT "*** Uninstalling FIPS module"
581- DELETE ossl_installroot:[MODULES{- $sover_dirname.$ target{pointer_size} -}.'arch']$(FIPSMODULENAME);*
587+ DELETE ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']$(FIPSMODULENAME);*
582588{- output_on() if $disabled{fips}; "" -}
583589
584590install_ssldirs : check_INSTALLTOP
@@ -607,7 +613,9 @@ install_dev : check_INSTALLTOP install_runtime_libs
607613 @ WRITE SYS$OUTPUT "*** Installing development files"
608614 @ ! Install header files
609615 - CREATE/DIR ossl_installroot:[include.openssl]
610- COPY/PROT=W:R openssl:*.h ossl_installroot:[include.openssl]
616+ COPY/PROT=W:R ossl_sourceroot:[include.openssl]*.h -
617+ ossl_installroot:[include.openssl]
618+ COPY/PROT=W:R [.include.openssl]*.h ossl_installroot:[include.openssl]
611619 @ ! Install static (development) libraries
612620 - CREATE/DIR ossl_installroot:[LIB.'arch']
613621 {- join("\n ",
@@ -626,9 +634,9 @@ install_engines : check_INSTALLTOP install_runtime_libs build_modules
626634install_modules : check_INSTALLTOP install_runtime_libs build_modules
627635 @ {- output_off() unless scalar @install_modules; "" -} !
628636 @ WRITE SYS$OUTPUT "*** Installing modules"
629- - CREATE/DIR ossl_installroot:[MODULES{- $sover_dirname.$ target{pointer_size} -}.'arch']
637+ - CREATE/DIR ossl_installroot:[MODULES{- $target{pointer_size} -}.'arch']
630638 {- join("\n ",
631- map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[MODULES$sover_dirname$ target{pointer_size}.'arch']" }
639+ map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[MODULES$target{pointer_size}.'arch']" }
632640 @install_modules) -}
633641 @ {- output_on() unless scalar @install_modules; "" -} !
634642
904912 #
905913 my $target = platform->def($args{src});
906914 my $mkdef = sourcefile('util', 'mkdef.pl');
907- my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION )' : '';
915+ my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION_NUMBER )' : '';
908916 my $ord_name =
909917 $args{generator}->[1] || basename($args{product}, '.EXE');
910918 my $case_insensitive =
0 commit comments