diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-12 10:46:14 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-13 00:02:55 +0100 |
| commit | 8a0a3d293cc51c1cfeb5a3fecca01ec106747694 (patch) | |
| tree | 7da44a9ca577d101f2571fe080403212d2198388 | |
| parent | bbd9a50fa8e371927c290170ab6b8ac2597e5ff9 (diff) | |
Use single quotes rather than double quotes when needed
When passing down values to Makefile.shared, do so with single quotes
as much as possible to avoid having the shell create a mess of quotes.
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 6e023b75b2..522d80f0d0 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -950,15 +950,15 @@ EOF $target: $lib$libext $deps $ordinalsfile \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ PLATFORM=\$(PLATFORM) \\ - PERL=\$(PERL) SRCDIR="\$(SRCDIR)" DSTDIR="$libd" \\ - INSTALLTOP="\$(INSTALLTOP)" LIBDIR="\$(LIBDIR)" \\ - LIBDEPS="\$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS)" \\ + PERL=\$(PERL) SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\ + INSTALLTOP='\$(INSTALLTOP)' LIBDIR='\$(LIBDIR)' \\ + LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\ LIBNAME=$libname LIBVERSION=\$(SHLIB_MAJOR).\$(SHLIB_MINOR) \\ - LIBCOMPATVERSIONS=";\$(SHLIB_VERSION_HISTORY)" \\ - CC="\$(CC)" CFLAGS="\$(CFLAGS) \$(LIB_CFLAGS)" \\ - CROSS_COMPILE="\$(CROSS_COMPILE)" LDFLAGS="\$(LDFLAGS)" \\ - SHARED_LDFLAGS="\$(LIB_LDFLAGS)" SHLIB_EXT=$shlibext \\ - SHARED_RCFLAGS="\$(RCFLAGS)" \\ + LIBCOMPATVERSIONS=';\$(SHLIB_VERSION_HISTORY)' \\ + CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(LIB_CFLAGS)' \\ + CROSS_COMPILE='\$(CROSS_COMPILE)' LDFLAGS='\$(LDFLAGS)' \\ + SHARED_LDFLAGS='\$(LIB_LDFLAGS)' SHLIB_EXT=$shlibext \\ + SHARED_RCFLAGS='\$(RCFLAGS)' \\ link_shlib.$shlib_target EOF . (windowsdll() ? <<"EOF" : ""); @@ -986,11 +986,11 @@ EOF $target: $objs $deps \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ PLATFORM=\$(PLATFORM) \\ - PERL=\$(PERL) SRCDIR="\$(SRCDIR)" DSTDIR="$libd" \\ - LIBDEPS="\$(PLIB_LDFLAGS) $shlibdeps \$(EX_LIBS)" \\ - LIBNAME=$libname LDFLAGS="\$(LDFLAGS)" \\ - CC="\$(CC)" CFLAGS="\$(CFLAGS) \$(DSO_CFLAGS)" \\ - SHARED_LDFLAGS="\$(DSO_LDFLAGS)" \\ + PERL=\$(PERL) SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\ + LIBDEPS='\$(PLIB_LDFLAGS) '"$shlibdeps"' \$(EX_LIBS)' \\ + LIBNAME=$libname LDFLAGS='\$(LDFLAGS)' \\ + CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(DSO_CFLAGS)' \\ + SHARED_LDFLAGS='\$(DSO_LDFLAGS)' \\ SHLIB_EXT=$dsoext \\ LIBEXTRAS="$objs" \\ link_dso.$shlib_target @@ -1025,9 +1025,9 @@ $bin$exeext: $objs $deps \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ PERL=\$(PERL) SRCDIR=\$(SRCDIR) \\ APPNAME=$bin$exeext OBJECTS="$objs" \\ - LIBDEPS="\$(PLIB_LDFLAGS) $linklibs \$(EX_LIBS)" \\ - CC="\$(CC)" CFLAGS="\$(CFLAGS) \$(BIN_CFLAGS)" \\ - LDFLAGS="\$(LDFLAGS)" LIBRPATH="\$(INSTALLTOP)/\$(LIBDIR)" \\ + LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\ + CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(BIN_CFLAGS)' \\ + LDFLAGS='\$(LDFLAGS)' LIBRPATH='\$(INSTALLTOP)/\$(LIBDIR)' \\ link_app.$shlib_target EOF } |