提交 cbece220 编写于 作者: R Richard Levitte

Allow space in PERL spec (unix only)

Someone wants to configure like this:

    PERL="/usr/bin/env perl" ./config

The end goal is to get that in the #! line of CA.pl and a few other
scripts.  That works well already, but in the Makefile, there were a
few lines looking like this:

    PERL=$(PERL) $(PERL) whatever.pl ...

Those need some quoting.

RT#4311
Reviewed-by: NMatt Caswell <matt@openssl.org>
上级 46ac07f5
...@@ -230,6 +230,7 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep \ ...@@ -230,6 +230,7 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep \
( cd test; \ ( cd test; \
SRCTOP=../$(SRCDIR) \ SRCTOP=../$(SRCDIR) \
BLDTOP=../$(BLDDIR) \ BLDTOP=../$(BLDDIR) \
PERL="$(PERL)" \
EXE_EXT={- $exeext -} \ EXE_EXT={- $exeext -} \
OPENSSL_ENGINES=../$(BLDDIR)/engines \ OPENSSL_ENGINES=../$(BLDDIR)/engines \
$(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) ) $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) )
...@@ -238,7 +239,7 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep \ ...@@ -238,7 +239,7 @@ tests: build_tests_nodep build_apps_nodep build_engines_nodep \
@ : {- output_on() if !$disabled{tests}; "" -} @ : {- output_on() if !$disabled{tests}; "" -}
list-tests: list-tests:
@TOP=$(SRCDIR) PERL=$(PERL) $(PERL) $(SRCDIR)/test/run_tests.pl list @TOP="$(SRCDIR)" PERL="$(PERL)" $(PERL) $(SRCDIR)/test/run_tests.pl list
libclean: libclean:
@set -e; for s in $(SHLIB_INFO); do \ @set -e; for s in $(SHLIB_INFO); do \
...@@ -960,7 +961,7 @@ EOF ...@@ -960,7 +961,7 @@ EOF
$target: $lib$libext $deps $ordinalsfile $target: $lib$libext $deps $ordinalsfile
\$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\
PLATFORM=\$(PLATFORM) \\ PLATFORM=\$(PLATFORM) \\
PERL=\$(PERL) SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\ PERL="\$(PERL)" SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\
INSTALLTOP='\$(INSTALLTOP)' LIBDIR='\$(LIBDIR)' \\ INSTALLTOP='\$(INSTALLTOP)' LIBDIR='\$(LIBDIR)' \\
LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\ LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\
LIBNAME=$libname LIBVERSION=\$(SHLIB_MAJOR).\$(SHLIB_MINOR) \\ LIBNAME=$libname LIBVERSION=\$(SHLIB_MAJOR).\$(SHLIB_MINOR) \\
...@@ -996,7 +997,7 @@ EOF ...@@ -996,7 +997,7 @@ EOF
$target: $objs $deps $target: $objs $deps
\$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\
PLATFORM=\$(PLATFORM) \\ PLATFORM=\$(PLATFORM) \\
PERL=\$(PERL) SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\ PERL="\$(PERL)" SRCDIR='\$(SRCDIR)' DSTDIR="$libd" \\
LIBDEPS='\$(PLIB_LDFLAGS) '"$shlibdeps"' \$(EX_LIBS)' \\ LIBDEPS='\$(PLIB_LDFLAGS) '"$shlibdeps"' \$(EX_LIBS)' \\
LIBNAME=$libname LDFLAGS='\$(LDFLAGS)' \\ LIBNAME=$libname LDFLAGS='\$(LDFLAGS)' \\
CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(DSO_CFLAGS)' \\ CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(DSO_CFLAGS)' \\
...@@ -1033,7 +1034,7 @@ EOF ...@@ -1033,7 +1034,7 @@ EOF
$bin$exeext: $objs $deps $bin$exeext: $objs $deps
\$(RM) $bin$exeext \$(RM) $bin$exeext
\$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\ \$(MAKE) -f \$(SRCDIR)/Makefile.shared -e \\
PERL=\$(PERL) SRCDIR=\$(SRCDIR) \\ PERL="\$(PERL)" SRCDIR=\$(SRCDIR) \\
APPNAME=$bin$exeext OBJECTS="$objs" \\ APPNAME=$bin$exeext OBJECTS="$objs" \\
LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\ LIBDEPS='\$(PLIB_LDFLAGS) '"$linklibs"' \$(EX_LIBS)' \\
CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(BIN_CFLAGS)' \\ CC='\$(CC)' CFLAGS='\$(CFLAGS) \$(BIN_CFLAGS)' \\
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册