From 79d1396cfaae09486314dac680fb68d206dda5aa Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 15 Apr 2009 09:18:15 -0500 Subject: [svn-r16755] bug fix (ID 1345): Use environment variable instead of command parameter to test the install via $DESTDIR test. Tested: Jam by hand. (no h5committest which does not test this change.) --- Makefile.am | 6 +++--- Makefile.in | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8e6a4ab..c402ac0 100755 --- a/Makefile.am +++ b/Makefile.am @@ -154,7 +154,7 @@ installcheck-local: # check-install is just a synonym for installcheck check-install: installcheck -# check-all-install tests installing default vs. prefix= vs. $DESTDIR. +# check-all-install tests all installation methods. # Install via different mechanism and then compare against the default. # Fine if only libXXX.a files are different since they may have been ranlib'ed. check-all-install: @@ -165,8 +165,8 @@ check-all-install: @echo Compare against the default installation. @echo Fine if only libXXX.a files are different. -diff -r prefix-tmp ${prefix} - @echo Installing to different DESTDIR location - $(MAKE) DESTDIR=${ROOT}/destdir-tmp install + @echo Installing to different \$DESTDIR location + env DESTDIR=${ROOT}/destdir-tmp $(MAKE) install @echo Compare against the default installation. @echo Fine if only libXXX.a files are different. -diff -r destdir-tmp${prefix} ${prefix} diff --git a/Makefile.in b/Makefile.in index d4addb4..ee87a5e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -893,7 +893,7 @@ installcheck-local: # check-install is just a synonym for installcheck check-install: installcheck -# check-all-install tests installing default vs. prefix= vs. $DESTDIR. +# check-all-install tests all installation methods. # Install via different mechanism and then compare against the default. # Fine if only libXXX.a files are different since they may have been ranlib'ed. check-all-install: @@ -904,8 +904,8 @@ check-all-install: @echo Compare against the default installation. @echo Fine if only libXXX.a files are different. -diff -r prefix-tmp ${prefix} - @echo Installing to different DESTDIR location - $(MAKE) DESTDIR=${ROOT}/destdir-tmp install + @echo Installing to different \$DESTDIR location + env DESTDIR=${ROOT}/destdir-tmp $(MAKE) install @echo Compare against the default installation. @echo Fine if only libXXX.a files are different. -diff -r destdir-tmp${prefix} ${prefix} -- cgit v0.12