BIND 10 master, updated. 380b3e8ec02ef45555c0113ee19329fe80539f71 [master/1982] append $(DESTDIR) to the paths checked in compatcheck.

[BIND 10 source code commits]

The branch, master has been updated
       via  380b3e8ec02ef45555c0113ee19329fe80539f71 (commit)
      from  469b4078b27d456cbbce856edfd8b57b437c317b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 380b3e8ec02ef45555c0113ee19329fe80539f71
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Jun 11 13:54:06 2012 -0700

    [master/1982] append $(DESTDIR) to the paths checked in compatcheck.

-----------------------------------------------------------------------

Summary of changes:
 compatcheck/Makefile.am |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/compatcheck/Makefile.am b/compatcheck/Makefile.am
index 15ef017..6cc4036 100644
--- a/compatcheck/Makefile.am
+++ b/compatcheck/Makefile.am
@@ -1,12 +1,17 @@
-# We're going to abuse install-data-local for a pre-install check.
-# This is to be considered a short term hack and is expected to be removed
-# in a near future version.
+# We're going to abuse install-data-local for a pre-install check.  This may
+# not be the cleanest way to do this type of job, but that's the least ugly
+# one we've found.
+#
+# Note also that if any test needs to examine some file that has possibly
+# been installed before (e.g., older DB or configuration file), it should be
+# referenced with the prefix of DESTDIR.  Otherwise
+# 'make DESTDIR=/somewhere install' may not work.
 install-data-local:
-	if test -e $(localstatedir)/$(PACKAGE)/zone.sqlite3; then \
+	if test -e $(DESTDIR)$(localstatedir)/$(PACKAGE)/zone.sqlite3; then \
 		$(SHELL) $(top_builddir)/src/bin/dbutil/run_dbutil.sh --check \
-		$(localstatedir)/$(PACKAGE)/zone.sqlite3 || \
+		$(DESTDIR)$(localstatedir)/$(PACKAGE)/zone.sqlite3 || \
 		(echo "\nSQLite3 DB file schema version is old.  " \
 		"Please run: " \
 		"$(abs_top_builddir)/src/bin/dbutil/run_dbutil.sh --upgrade " \
-		"$(localstatedir)/$(PACKAGE)/zone.sqlite3";  exit 1) \
+		"$(DESTDIR)$(localstatedir)/$(PACKAGE)/zone.sqlite3"; exit 1) \
 	fi