Mercurial > octave
changeset 25310:0b253ba6eb91 stable
avoid syntax errors in build-aux/subst scripts
* m4/acinclude.m4: Use ${top_srcdir} instead of $(top_srcdir) to avoid
syntax errors in shell scripts.
* subst-config-vals.in.sh, subst-cross-config-vals.in.sh:
Also define srcdir, top_srcdir, abs_srcdir, and abs_top_srcdir.
Define directory variables ahead of any other variables that might use
them.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 25 Apr 2018 10:23:22 -0400 |
| parents | 7d32780f4dea |
| children | 10ec5795bd06 |
| files | build-aux/subst-config-vals.in.sh build-aux/subst-cross-config-vals.in.sh m4/acinclude.m4 |
| diffstat | 3 files changed, 39 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh Wed Apr 25 08:55:48 2018 -0400 +++ b/build-aux/subst-config-vals.in.sh Wed Apr 25 10:23:22 2018 -0400 @@ -20,6 +20,21 @@ : ${SED=@SED@} +prefix="@prefix@" +exec_prefix="@exec_prefix@" + +bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"` +libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"` +octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"` + +includedir=`echo "@includedir@" | sed "s|^${prefix}/||"` +octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"` + +srcdir="@srcdir@" +top_srcdir="@top_srcdir@" +abs_srcdir="@abs_srcdir@" +abs_top_srcdir="@abs_top_srcdir@" + NO_OCT_FILE_STRIP="@NO_OCT_FILE_STRIP@" AMD_CPPFLAGS="@AMD_CPPFLAGS@" AMD_LDFLAGS="@AMD_LDFLAGS@" @@ -178,16 +193,6 @@ Z_LIBS="@Z_LIBS@" config_opts="@config_opts@" -prefix="@prefix@" -exec_prefix="@exec_prefix@" - -bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"` -libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"` -octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"` - -includedir=`echo "@includedir@" | sed "s|^${prefix}/||"` -octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"` - $SED \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by subst-config-vals.|" \ -e "s|%NO_OCT_FILE_STRIP%|${NO_OCT_FILE_STRIP}|" \
--- a/build-aux/subst-cross-config-vals.in.sh Wed Apr 25 08:55:48 2018 -0400 +++ b/build-aux/subst-cross-config-vals.in.sh Wed Apr 25 10:23:22 2018 -0400 @@ -32,6 +32,21 @@ ## OCTAVE_CONF_MKOCTFILE_LD_CXX ## OCTAVE_CONF_MKOCTFILE_RANLIB +prefix="@prefix@" +exec_prefix="@exec_prefix@" + +bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"` +libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"` +octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"` + +includedir=`echo "@includedir@" | sed "s|^${prefix}/||"` +octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"` + +srcdir="@srcdir@" +top_srcdir="@top_srcdir@" +abs_srcdir="@abs_srcdir@" +abs_top_srcdir="@abs_top_srcdir@" + NO_OCT_FILE_STRIP="@NO_OCT_FILE_STRIP@" AMD_CPPFLAGS="@AMD_CPPFLAGS@" AMD_LDFLAGS="@AMD_LDFLAGS@" @@ -182,16 +197,6 @@ Z_LIBS="@Z_LIBS@" config_opts="@config_opts@" -prefix="@prefix@" -exec_prefix="@exec_prefix@" - -bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/||"` -libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/||"` -octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/||"` - -includedir=`echo "@includedir@" | sed "s|^${prefix}/||"` -octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/||"` - $SED \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by subst-config-vals.|" \ -e "s|%NO_OCT_FILE_STRIP%|${NO_OCT_FILE_STRIP}|" \
--- a/m4/acinclude.m4 Wed Apr 25 08:55:48 2018 -0400 +++ b/m4/acinclude.m4 Wed Apr 25 10:23:22 2018 -0400 @@ -2936,7 +2936,7 @@ fi if test $tmp_have_bison = no; then - YACC='$(top_srcdir)/build-aux/missing bison' + YACC='${top_srcdir}/build-aux/missing bison' warn_bison=" I didn't find bison, or the version of bison that I found does not @@ -2974,7 +2974,7 @@ LEXLIB= ;; *) - LEX='$(top_srcdir)/build-aux/missing flex' + LEX='${top_srcdir}/build-aux/missing flex' warn_flex=" I didn't find flex, but it's only a problem if you need to reconstruct @@ -2999,7 +2999,7 @@ esac AC_CHECK_PROGS(GHOSTSCRIPT, [$ac_octave_gs_names]) if test -z "$GHOSTSCRIPT"; then - GHOSTSCRIPT='$(top_srcdir)/build-aux/missing gs' + GHOSTSCRIPT='${top_srcdir}/build-aux/missing gs' warn_ghostscript=" I didn't find ghostscript, so reconstructing figures for the manual @@ -3040,14 +3040,14 @@ AC_DEFUN([OCTAVE_PROG_GPERF], [ AC_CHECK_PROG(GPERF, gperf, gperf, []) if test -z "$GPERF"; then - GPERF='$(top_srcdir)/build-aux/missing gperf' + GPERF='${top_srcdir}/build-aux/missing gperf' warn_gperf=" I didn't find gperf, but it's only a problem if you need to reconstruct oct-gperf.h " OCTAVE_CONFIGURE_WARNING([warn_gperf]) - GPERF='$(top_srcdir)/build-aux/missing gperf' + GPERF='${top_srcdir}/build-aux/missing gperf' fi AC_SUBST(GPERF) ]) @@ -3057,7 +3057,7 @@ AC_DEFUN([OCTAVE_PROG_ICOTOOL], [ AC_CHECK_PROG(ICOTOOL, icotool, icotool, []) if test -z "$ICOTOOL"; then - ICOTOOL='$(top_srcdir)/build-aux/missing icotool' + ICOTOOL='${top_srcdir}/build-aux/missing icotool' warn_icotool=" I didn't find icotool, but it's only a problem if you need to @@ -3166,7 +3166,7 @@ AC_DEFUN([OCTAVE_PROG_RSVG_CONVERT], [ AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert, []) if test -z "$RSVG_CONVERT"; then - RSVG_CONVERT='$(top_srcdir)/build-aux/missing rsvg-convert' + RSVG_CONVERT='${top_srcdir}/build-aux/missing rsvg-convert' warn_rsvg_convert=" I didn't find rsvg-convert, but it's only a problem if you need to @@ -3274,7 +3274,7 @@ AC_DEFUN([OCTAVE_PROG_TEXI2DVI], [ AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, []) if test -z "$TEXI2DVI"; then - TEXI2DVI='$(top_srcdir)/build-aux/missing texi2dvi' + TEXI2DVI='${top_srcdir}/build-aux/missing texi2dvi' warn_texi2dvi=" I didn't find texi2dvi, but it's only a problem if you need to @@ -3300,7 +3300,7 @@ ac_octave_texi2pdf_missing=no; fi if test $ac_octave_texi2pdf_missing = yes; then - TEXI2PDF='$(top_srcdir)/build-aux/missing texi2pdf' + TEXI2PDF='${top_srcdir}/build-aux/missing texi2pdf' warn_texi2pdf=" I didn't find texi2pdf, but it's only a problem if you need to