diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-23 15:51:25 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-23 15:51:25 +0200 |
commit | f357bed82aed91aa3eef5e157df4814c7fc26028 (patch) | |
tree | 83ac18b7edea9e1a8c75c0427db1ae300741b4b3 /t/posixsubst-scripts.sh | |
parent | 509b231118fff35e8f5dbfa797218265e8bc6acc (diff) | |
download | automake-f357bed82aed91aa3eef5e157df4814c7fc26028.tar.gz |
tests: cater to systems installing libs in /lib64
See automake bug#11302.
On at least OpenSUSE 12.1, "make install" will install libraries in
the '${prefix}/lib64' directory by default. This is due to the
$CONFIG_SITE set by /etc/profile.d/site.sh, which sets a libdir
that ends in '/lib64' rather than '/lib' if it finds that the compiler
is generating 64-bit code. This behaviour was causing some spurious
failures in our testsuite. Fix them.
* t/posixsubst-libraries.sh: Assume the libraries are installed in
'$(libdir)' rather than in '$(prefix)/lib'.
* t/posixsubst-ltlibraries.sh: Likewise.
* t/posixsubst-scripts.sh: Similarly, don't assume that '$(bindir)',
'$(sbindir)' and '$(libexedir)' always defaults to respectively
'$(prefix)/bin', '$(prefix)/sbin' and '$(prefix)/libexec'.
* t/transform3.test: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/posixsubst-scripts.sh')
-rwxr-xr-x | t/posixsubst-scripts.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh index 934b82eb4..cda515fb5 100755 --- a/t/posixsubst-scripts.sh +++ b/t/posixsubst-scripts.sh @@ -65,17 +65,17 @@ test2: distdir test ! -r $(distdir)/quux.pl installcheck-local: - ls -l $(prefix)/libexec $(prefix)/bin $(prefix)/sbin - test -f $(prefix)/sbin/foo1.sh - test -x $(prefix)/sbin/foo1.sh - test -f $(prefix)/sbin/foo2.sh - test -x $(prefix)/sbin/foo2.sh - test -f $(prefix)/libexec/bar1 - test -x $(prefix)/libexec/bar1 - test -f $(prefix)/libexec/bar2 - test -x $(prefix)/libexec/bar2 - test -f $(prefix)/bin/quux.pl - test -x $(prefix)/bin/quux.pl + ls -l $(libexecdir) $(bindir) $(sbindir) + test -f $(sbindir)/foo1.sh + test -x $(sbindir)/foo1.sh + test -f $(sbindir)/foo2.sh + test -x $(sbindir)/foo2.sh + test -f $(libexecdir)/bar1 + test -x $(libexecdir)/bar1 + test -f $(libexecdir)/bar2 + test -x $(libexecdir)/bar2 + test -f $(bindir)/quux.pl + test -x $(bindir)/quux.pl END cat > foo1.sh <<'END' |