diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-13 14:05:40 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-13 14:05:40 +0200 |
| commit | c6cc38027572445a25d749db99473f82521cc79e (patch) | |
| tree | a9b3862bc5261760d81ba262ae54f971bf1fde00 /t/subdir-add2-pr46.sh | |
| parent | 2868ff8ca1792a7d5298923aff49647a754bc23e (diff) | |
| parent | daeca29aa2500bcbba1fd7bfe285a6e6d0500ef3 (diff) | |
| download | automake-c6cc38027572445a25d749db99473f82521cc79e.tar.gz | |
Merge branch 'maint'
* maint:
tests: rework tests on AM_PATH_PYTHON
cosmetics: fix typos and references in comments
typofix: in a test diagnostic
readme: fixlets to HACKING
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/subdir-add2-pr46.sh')
| -rwxr-xr-x | t/subdir-add2-pr46.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/t/subdir-add2-pr46.sh b/t/subdir-add2-pr46.sh index b226a09f2..a4020525d 100755 --- a/t/subdir-add2-pr46.sh +++ b/t/subdir-add2-pr46.sh @@ -15,8 +15,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test to make sure that adding a new directory works, even from -# subdirectories. The sister test 'subdir5.test' makes sure it works -# when make is run from the top-level directory. +# subdirectories. The sister test 'subdir-add-pr46.sh' makes sure +# it works when make is run from the top-level directory. # PR automake/46 . ./defs || exit 1 @@ -49,10 +49,10 @@ $MAKE # Now add new directories. -# The first step users typically do when adding a new subdir is -# editing configure.ac. That is already tested by subdir5.test, -# though, so here we try to just edit a file that is included by -# configure.ac, without touching configure.ac itself. +# The first step users typically do when adding a new subdir is editing +# configure.ac. That is already tested by 'subdir-add-pr46.sh' though, +# so here we try to just edit a file that is included by configure.ac, +# without touching configure.ac itself. mkdir sub/maude cat > sub/maude/Makefile.am << 'END' @@ -66,10 +66,10 @@ echo 'SUBDIRS = maude' >> sub/Makefile.am mkdir maude : > maude/Makefile.am -# Update confiles.m4 *after* updating sub/Makefile.am; subdir5.test do -# it in the other way: it updates configure.ac before Makefile.am. -# We sleep here because modified configure dependencies must be newer -# than config.status. +# Update confiles.m4 *after* updating sub/Makefile.am; the sister test +# 'subdir-add-pr46.sh' does it the in other way: it updates configure.ac +# before Makefile.am. We sleep here because modified configure +# dependencies must be newer than config.status. $sleep echo 'AC_CONFIG_FILES([maude/Makefile sub/maude/Makefile])' >> confiles.m4 |