diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2011-11-21 18:02:23 +0700 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2011-11-25 14:53:42 +0700 |
| commit | 61e09a55669820ab0cd2bb3ffcdbd8e40baa6497 (patch) | |
| tree | df3973f64940db29edce1062bc4106a2c8e834e7 /bootstrap.conf | |
| parent | 962aa919f51cdf8e2cee4fb2d1d9bafa34d50887 (diff) | |
| download | libtool-61e09a55669820ab0cd2bb3ffcdbd8e40baa6497.tar.gz | |
syntax-check: fix violations and implement sc_prohibit_sed_s_comma.
I like to name temporary directories that I will remove shortly
with two leading commas so that they sort lexicographically at
the top of `ls' output. Now, `./configure
--prefix=`pwd`/,,inst' works again, for the first time in
several years.
* cfg.mk (sc_prohibit_sed_s_comma): Comma is too common a
character to use routinely as the separator for sed
substitutions on file paths and other variables determined by
the user, causing bugs like the one I describe above. Make sure
we don't accidentally reintroduce any comma separators in
future.
* Makefile.am, bootstrap, bootstrap.conf, build-aux/extract-trace,
build-aux/general.m4sh, build-aux/git-hooks/commit-msg,
build-aux/git-log-fix, build-aux/ltmain.m4sh, libtoolize.m4sh,
m4/libtool.m4, m4/ltdl.m4, tests/cdemo-undef.test,
tests/cmdline_wrap.at, tests/darwin.at, tests/defs.m4sh,
tests/getopt-m4sh.at, tests/install.at, tests/libtoolize.at,
tests/mdemo/Makefile.am, tests/need_lib_prefix.at,
tests/sysroot.at, tests/tagdemo-undef.test, tests/testsuite.at:
Try to use `|' as the default separator wherever possible,
otherwise something else that doesn't occur in the substitution
expression.
* NEWS: Updated.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
Diffstat (limited to 'bootstrap.conf')
| -rw-r--r-- | bootstrap.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index c3491b5b..f7bc1ac0 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,4 +1,4 @@ -# bootstrap.conf (GNU Libtool) version 2011-11-11 +# bootstrap.conf (GNU Libtool) version 2011-11-21 # # Copyright (C) 2010, 2011 Free Software Foundation, Inc. # Written by Gary V. Vaughan, 2010 @@ -359,7 +359,7 @@ libtool_readme_release_package_substitutions () # Perform substitutions to a temporary file $SED -e "\ - s,\@PACKAGE\@,$package,g + s|\@PACKAGE\@|$package|g " "$my_readme" > "${my_readme}T" \ && mv "${my_readme}T" "$my_readme" } @@ -456,7 +456,7 @@ libtool_require_package_url () # How to extract the parameters for `make bootstrap-deps' from # configure.ac. This is very specific to the way Libtool's # configure.ac layout. - sed_extract_package_url='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,; + sed_extract_package_url='s|#.*$||; s|^dnl .*$||; s| dnl .*$||; /AC_SUBST([[]*PACKAGE_URL/{ s|.*AC_SUBST([[ ]*PACKAGE_URL[] ]*,[[ ]*|package_url="| s|[]) ]*$|"| |