diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-24 00:59:09 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-24 00:59:09 +0100 |
| commit | 5fe2bfee7631572b39f59307d7076dbaa9b6fc5e (patch) | |
| tree | 764e459b2ee6f663bd45cd67f50212f74247599f /t/subdir-am-cond.sh | |
| parent | 108a98575462e54dffa0083a773a46c57a23a113 (diff) | |
| parent | c24233d4194639cf2f87ceee162b0f0525ecdbd3 (diff) | |
| download | automake-5fe2bfee7631572b39f59307d7076dbaa9b6fc5e.tar.gz | |
Merge branch 'master' into ng/master
* master:
dist: fix bug#18286 "distcheck fails to detect missing files"
tests: expose automake bug#18286 "distcheck fails to detect missing files"
include: fix bug in handling of user-defined makefile fragments generation
tests: expose bug in handling of user-defined makefile fragments generation
+ Extra non-trivial changes:
* lib/am/distcheck.mk: Backport the changes done to lib/am/distdir.am
in commit v1.14.1-4-g01a7a4a (fix for automake bug#18286 "distcheck
fails to detect missing files").
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/subdir-am-cond.sh')
| -rw-r--r-- | t/subdir-am-cond.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/t/subdir-am-cond.sh b/t/subdir-am-cond.sh index 73dba483a..69345d1a3 100644 --- a/t/subdir-am-cond.sh +++ b/t/subdir-am-cond.sh @@ -20,13 +20,13 @@ . test-init.sh -cat >>configure.ac <<'END' +cat >> configure.ac <<'END' AM_CONDITIONAL([COND_OPT], [test "$want_opt" = yes]) AC_CONFIG_FILES([src/Makefile opt/Makefile]) AC_OUTPUT END -cat >Makefile.am << 'END' +cat > Makefile.am <<'END' if COND_OPT MAYBE_OPT = opt endif @@ -42,16 +42,18 @@ SUBDIRS = src $(MAYBE_OPT) # We rely on 'distcheck' to run 'check-local' and use # 'sanity1' and 'sanity2' as evidences that test-build was run. +test_rootdir = $(top_builddir)/../../.. + if COND_OPT test-build: all test -f src/result test -f opt/result - : > $(top_builddir)/../../sanity2 + : > $(test_rootdir)/sanity2 else test-build: all test -f src/result test ! -f opt/result - : > $(top_builddir)/../../sanity1 + : > $(test_rootdir)/sanity1 endif test-dist: distdir @@ -65,7 +67,7 @@ mkdir src opt : > src/source : > opt/source -cat >src/Makefile.am << 'END' +cat > src/Makefile.am <<'END' EXTRA_DIST = source all-local: result CLEANFILES = result @@ -75,7 +77,7 @@ result: source END # We want in opt/ the same Makefile as in src/. Let's exercise 'include'. -cat >opt/Makefile.am << 'END' +cat > opt/Makefile.am <<'END' include ../src/Makefile.am END |