BIND 10 bind10-20110705-release, updated. 4e17185380e2d5b1f02c65c10ea1cad441848793 [bind10-20110705-release][master] hack to check for previous isc/log directory

[BIND 10 source code commits]

The branch, bind10-20110705-release has been updated
       via  4e17185380e2d5b1f02c65c10ea1cad441848793 (commit)
      from  a682d8bb52f8ddfdf5631d39d524dd6c4f1dbec0 (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 4e17185380e2d5b1f02c65c10ea1cad441848793
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Tue Jul 5 11:13:04 2011 -0500

    [bind10-20110705-release][master] hack to check for previous isc/log directory
    
    This is from patch ticket #1053 from jinmei.
    http://bind10.isc.org/attachment/ticket/1053/makefile.diff
    
    It is a workaround to problem with isc/log name reuse.

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

Summary of changes:
 src/lib/python/isc/log/Makefile.am |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/log/Makefile.am b/src/lib/python/isc/log/Makefile.am
index b228caf..5ff2c28 100644
--- a/src/lib/python/isc/log/Makefile.am
+++ b/src/lib/python/isc/log/Makefile.am
@@ -23,6 +23,15 @@ log_la_LIBADD += $(PYTHON_LIB)
 # This is not installed, it helps locate the module during tests
 EXTRA_DIST = __init__.py
 
+# 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.
+install-data-local:
+	if test -d @pyexecdir@/isc/log; then \
+		echo "@pyexecdir@/isc/log is deprecated, and will confuse newer versions.  Please (re)move it by hand."; \
+		exit 1; \
+	fi
+
 pytest:
 	$(SHELL) tests/log_test