BIND 10 master, updated. ab4d20907abdb3ce972172463dcc73405b3dee79 Merge branch 'master' into trac2171

[BIND 10 source code commits]

The branch, master has been updated
       via  ab4d20907abdb3ce972172463dcc73405b3dee79 (commit)
       via  b71313c089c3a2dce333061b5b243555743561c8 (commit)
       via  46ad312845e75e7b1e8481efe5c84ef6dd98939d (commit)
      from  ecb6a3aad71647bc11305fa8b8789a60ed591cfb (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 ab4d20907abdb3ce972172463dcc73405b3dee79
Merge: b71313c ecb6a3a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Aug 8 21:25:46 2012 +0530

    Merge branch 'master' into trac2171

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

Summary of changes:
 src/bin/cfgmgr/Makefile.am   |    3 ++-
 src/bin/loadzone/Makefile.am |    4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cfgmgr/Makefile.am b/src/bin/cfgmgr/Makefile.am
index aee78cf..4a6fc0d 100644
--- a/src/bin/cfgmgr/Makefile.am
+++ b/src/bin/cfgmgr/Makefile.am
@@ -26,8 +26,9 @@ b10-cfgmgr: b10-cfgmgr.py
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/@localstatedir@/@PACKAGE@
-# TODO: permissions handled later
 
+install-data-hook:
+	-chmod 2770 $(DESTDIR)/@localstatedir@/@PACKAGE@
 
 CLEANDIRS = __pycache__
 
diff --git a/src/bin/loadzone/Makefile.am b/src/bin/loadzone/Makefile.am
index a235d68..74386ae 100644
--- a/src/bin/loadzone/Makefile.am
+++ b/src/bin/loadzone/Makefile.am
@@ -20,10 +20,6 @@ b10-loadzone: b10-loadzone.py
 	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" b10-loadzone.py >$@
 	chmod a+x $@
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)/@localstatedir@/@PACKAGE@
-# TODO: permissions handled later
-
 EXTRA_DIST += tests/normal/README
 EXTRA_DIST += tests/normal/dsset-subzone.example.com
 EXTRA_DIST += tests/normal/example.com