From 0cf01ab09e9f5efbe241b87a05485d2b6d0a9abb Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 15 Apr 2009 17:35:33 -0500 Subject: [svn-r16762] New feature (Bug ID: 1345): Added a Make target of check-all-install to test the correctness of installing via the prefix= or $DESTDIR options. Platforms tested: jam by hand. The test failed because installing by $DESTDIR is actually not working! I go on with the commit because I am sure the tests are correct. Will fix DESTDIR problem. --- Makefile.in | 18 ++++++++++++++++++ release_docs/RELEASE.txt | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index fbd1afd..0cb0235 100644 --- a/Makefile.in +++ b/Makefile.in @@ -133,6 +133,23 @@ check-install: fi; \ done +# 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: + @echo Installing to default location + $(MAKE) install + @echo Installing to different prefix location + $(MAKE) prefix=${ROOT}/prefix-tmp 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 + 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} + ## Number format detection H5detect: (cd src && $(MAKE) $@) @@ -148,6 +165,7 @@ clean mostlyclean: (cd $$d && $(MAKE) $@); \ done -$(RM) conftest conftest.c + -$(RM) -rf prefix-tmp destdir-tmp distclean: @@SETX@; for d in $(SUBDIRS) doc perform examples; do \ diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 5047f4f..e9bafa4 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -44,7 +44,9 @@ New Features ============ Configuration: ------------------------- - - Add description here. Do not exceed 80 characters for a line + - Added a Make target of check-all-install to test the correctness of + installing via the prefix= or $DESTDIR options. AKC - 2009/04/14 + - Add description here. Do not exceed 80 characters for a line EIP - 2008/11/12 (year/month/day format) Library: -- cgit v0.12