diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-06 13:17:23 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-06 13:17:23 +0100 |
commit | 6357a630dc3cac6682a0f17b255104b4dd78f89a (patch) | |
tree | d420589f8adb98e6b9ca0d38a1b0183e8031dd85 /t/subobj11b.sh | |
parent | 46ce39e1a24f3016db3bc6cf857977be7a1cda1b (diff) | |
parent | 92ed3be97837a3de1634a13959c70c686b17d38d (diff) | |
download | automake-6357a630dc3cac6682a0f17b255104b4dd78f89a.tar.gz |
Merge branch 'minor'
* minor:
deps: fix corner-case "make distclean" bug
compile: don't place built object files in $(srcdir), ever ...
tests: fix some bugs in an XFAILing test
deps: 'subdir-object' option now works when foo_SOURCES contains $(var)
NEWS: fix a typo
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/subobj11b.sh')
-rw-r--r-- | t/subobj11b.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/subobj11b.sh b/t/subobj11b.sh index db29e5e58..12e2216d2 100644 --- a/t/subobj11b.sh +++ b/t/subobj11b.sh @@ -56,9 +56,9 @@ END $ACLOCAL $AUTOMAKE -a -# Be lax in the regexp, to account for automake conditionals, the -# use of @am__include@, and similar stuff. -grep 'include.*//.*foobar' Makefile.in && exit 1 +grep '\.P' Makefile.in # For debugging. + +grep '//.*foobar\.P' Makefile.in && exit 1 # These checks depend on automake internals, but presently this is # the only way to test the code path we are interested in. @@ -71,12 +71,12 @@ for x in zardoz0 zardoz1 path/to/zardoz2 another/path/to/zardoz3; do esac # Be a little lax in the regexp, to account for automake conditionals, # quoting, and similar stuff. - grep "^[^/]*am__include[^/]*//server/$d\\\$(DEPDIR)/$b\\.[^/]*$" Makefile.in + grep "[ ]//server/$d\\\$(DEPDIR)/$b\\.Po" Makefile.in done # Sanity checks. for i in 0 1 2 3 4 5 6 7 8 9; do - grep "am__include.*/foobar$i\\." Makefile.in + grep "\$(DEPDIR)/foobar$i\\.Po" Makefile.in done : |