diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 20:24:46 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-23 20:24:46 +0100 |
| commit | 6979c8e680b68dbc2b27b4db808cb037ba6aabb7 (patch) | |
| tree | db033eeadacb4c8cb8f8a91e2ce2674318e4ee1d /t/subdir-am-cond.sh | |
| parent | a38fe86d4f425575e9753b34d65d73c98838b085 (diff) | |
| parent | 01a7a4a7bea81b4e2d03d08b45d605b98501e024 (diff) | |
| download | automake-6979c8e680b68dbc2b27b4db808cb037ba6aabb7.tar.gz | |
Merge branch 'distcheck-pr18286' into micro
* distcheck-pr18286:
dist: fix bug#18286 "distcheck fails to detect missing files"
tests: expose automake bug#18286 "distcheck fails to detect missing files"
Diffstat (limited to 't/subdir-am-cond.sh')
| -rw-r--r-- | t/subdir-am-cond.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/t/subdir-am-cond.sh b/t/subdir-am-cond.sh index 8a36bc36d..69345d1a3 100644 --- a/t/subdir-am-cond.sh +++ b/t/subdir-am-cond.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -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 |