diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-21 15:42:17 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-21 15:42:17 +0100 |
| commit | 01797e0cf1e633d76e4cdf6015f185164590898d (patch) | |
| tree | ed4a48d90407c923ca30ee5d866643b878711c7e /contrib/multilib | |
| parent | f50c47007f45b32e67bbdf2289875f02f255e8bc (diff) | |
| parent | a537fbe62988ac551714b8d852dc8e03f1af4f1c (diff) | |
| download | automake-01797e0cf1e633d76e4cdf6015f185164590898d.tar.gz | |
Merge branch 'master' into ng/master
* master: (28 commits)
tests: "make installcheck" shouldn't run the testsuite twice
news: minor fixlets and reorganization
cosmetics: few typofixes
automake: new option 'serial-tests'
tests: fix a timestamp issue, and other minor buglets
automake: new option to print location of scripts and data files
docs: prefer the awk+sh TAP driver over the perl one
tests: be stricter in determining whether "make -jN" works
tests: don't trust exit status of "make -k"
tests: fix race condition in 'self-check-dir.tap'
parallel-tests: fix another BSD parallel make issue
tests: avoid FreeBSD make VPATH issues in more tests (see bug#7884)
cosmetics: remove extra trailing whitespace in configure.ac
tests: avoid spurious failure with FreeBSD make
tests: fix broken quoting in the generated yacc grammar
fixup: always use correct path for automake/aclocal wrappers
tests: fix spurious failure in VPATH build
tests: fix many spurious failures in VPATH builds
tests: relax a test to cater to NetBSD make
dryrun: $(am__dry_run) not confused by metachars in $(MAKEFLAGS)
...
Diffstat (limited to 'contrib/multilib')
| -rw-r--r-- | contrib/multilib/config-ml.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/multilib/config-ml.in b/contrib/multilib/config-ml.in index a68a005ad..0734a95b6 100644 --- a/contrib/multilib/config-ml.in +++ b/contrib/multilib/config-ml.in @@ -50,7 +50,7 @@ # To implement this, a symlink tree is built for each library and for each # multilib subdir. # -# The build tree is layed out as +# The build tree is laid out as # # ./ # newlib |