From afea0067ff1ef5040a5e3a7618d0007b3d4923c0 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 8 Jul 2016 18:30:43 +0200 Subject: VMS: Present OPENSSLDIR according to the VMS setup. This mostly affects 'openssl version -a', which might as well display what we're actually looking at. Reviewed-by: Rich Salz --- Configurations/descrip.mms.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Configurations') diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index c53c5005c8..2d98d50e32 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -152,11 +152,13 @@ SYSTARTUP={- catdir($installtop, '[.SYS$STARTUP]'); -} OPENSSLDIR={- catdir($config{openssldir}) || $config{prefix} ? catdir($config{prefix},"COMMON") : "SYS\$COMMON:[OPENSSL-COMMON]" -} -# Where installed engines reside -ENGINESDIR={- $osslprefix -}ENGINES{- $sover -}: +# The same, but for C +OPENSSLDIR_C={- $osslprefix -}DATAROOT:[000000] +# Where installed engines reside, for C +ENGINESDIR_C={- $osslprefix -}ENGINES{- $sover -}: CC= {- $target{cc} -} -CFLAGS= /DEFINE=({- join(",", @{$target{defines}}, @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR)\"\"\"") -}) {- $target{cflags} -} {- $config{cflags} -} +CFLAGS= /DEFINE=({- join(",", @{$target{defines}}, @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR_C)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR_C)\"\"\"") -}) {- $target{cflags} -} {- $config{cflags} -} CFLAGS_Q=$(CFLAGS) DEPFLAG= /DEFINE=({- join(",", @{$config{depdefines}}) -}) LDFLAGS= {- $target{lflags} -} -- cgit v1.2.3