diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-02 18:37:12 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-02 19:33:03 +0200 |
| commit | e0bfe7f9c8ad59537a685ac50c21d2e12c4cf570 (patch) | |
| tree | 170b5e6fc05c6916afca7dcd950bcba2cdf37861 /t/conflnk2.sh | |
| parent | 19e281405a599a29b32f9cf084e043dab3107de3 (diff) | |
| download | automake-e0bfe7f9c8ad59537a685ac50c21d2e12c4cf570.tar.gz | |
fragments: put them in a subdir of build-aux
This is a follow-up to previous commit 'v1.12.2-758-g19e2814'.
Instead of placing the verbatim makefile fragments in the directory
'$(top_srcdir)/.mk', we place them in '$(build-aux)/am-ng', where
'$(build-aux)' is the directory specified by AC_CONFIG_AUX_DIR, or,
if that is not explicitly specified, the directory automatically
determined by automake to help the auxiliary scripts and files (that
typically being '$(top_srcdir)').
* automake.in (verbatim): Implement the renaming.
* lib/am/distdir.am (am.dist.mk-files): Adjust to it.
* Makefile.am (amhello_configury): Likewise.
* .gitignore: Likewise.
* t/all2.sh: Likewise.
* t/conflnk2.sh: Likewise.
* t/serial-tests.sh: Likewise.
* t/spell.sh: Likewise.
* t/spell2.sh: Likewise.
* t/ax/depcomp.sh: Remove no-more-needed tweaks.
* t/ax/tap-setup.sh: Likewise.
* t/distdir.sh: Likewise.
* t/add-missing.tap: Adjust to avoid spurious failures.
Suggested-by: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
Suggested-by: Akim Demaille <akim@lrde.epita.fr>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/conflnk2.sh')
| -rwxr-xr-x | t/conflnk2.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/conflnk2.sh b/t/conflnk2.sh index 8c0bf9bca..e9d00e0af 100755 --- a/t/conflnk2.sh +++ b/t/conflnk2.sh @@ -45,7 +45,7 @@ $MAKE distdir find $distdir # For debugging. -rm -rf $distdir/.mk +rm -rf $distdir/am-ng test -f $distdir/src test -f $distdir/src2 |