diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-10-22 20:42:17 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-10-22 20:42:17 +0200 |
| commit | 6a2fe8188c546a1cdf0bfbb72f6ac9f1fcd70b78 (patch) | |
| tree | 786996f07fef7c03fd8a82fb458efa06c35df6e3 /lib | |
| parent | e98cba8d0c5d7b1826b1a450a750346a13b4da13 (diff) | |
| parent | ded01c88c9579656cc138ce7e0b55dcf025b1a5a (diff) | |
| download | automake-6a2fe8188c546a1cdf0bfbb72f6ac9f1fcd70b78.tar.gz | |
Merge branch 'dejagnu-srcdir-discrepancy' into maint
* dejagnu-srcdir-discrepancy:
dejagnu: ensure 'srcdir' is defined as a relative directory
Fix testsuite failure of check12.test without DejaGNU.
Extend and improve tests on DejaGnu support.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/am/dejagnu.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am index 08de45c61..5c5da5013 100644 --- a/lib/am/dejagnu.am +++ b/lib/am/dejagnu.am @@ -44,7 +44,7 @@ endif ! %?CYGNUS% .PHONY: check-DEJAGNU check-DEJAGNU: site.exp ## Life is easiest with an absolute srcdir, so do that. - srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ + srcdir='$(srcdir)'; export srcdir; \ EXPECT=$(EXPECT); export EXPECT; \ ## Allow this to work when expect and DejaGnu are in tree. ## Only required when --cygnus in force. @@ -77,7 +77,7 @@ site.exp: Makefile @echo '## these variables are automatically generated by make ##' >site.tmp @echo '# Do not edit here. If you wish to override these values' >>site.tmp @echo '# edit the last section' >>site.tmp - @echo 'set srcdir $(srcdir)' >>site.tmp + @echo 'set srcdir "$(srcdir)"' >>site.tmp @echo "set objdir `pwd`" >>site.tmp ## Quote the *_alias variables because they might be empty. ?BUILD? @echo 'set build_alias "$(build_alias)"' >>site.tmp |