[svn] commit: r1575 - in /branches/bind10-devel-20100319: Makefile.am configure.ac src/bin/bindctl/Makefile.am src/bin/cmdctl/Makefile.am

[BIND 10 source code commits]

Author: jreed
Date: Fri Mar 19 11:57:58 2010
New Revision: 1575

Log:
merged from trunk r1570 (so distcheck will work by not installing
configurations).

Modified:
    branches/bind10-devel-20100319/Makefile.am
    branches/bind10-devel-20100319/configure.ac
    branches/bind10-devel-20100319/src/bin/bindctl/Makefile.am
    branches/bind10-devel-20100319/src/bin/cmdctl/Makefile.am

Modified: branches/bind10-devel-20100319/Makefile.am
==============================================================================
--- branches/bind10-devel-20100319/Makefile.am (original)
+++ branches/bind10-devel-20100319/Makefile.am Fri Mar 19 11:57:58 2010
@@ -2,6 +2,9 @@
 USE_LCOV=@USE_LCOV@
 LCOV=@LCOV@
 GENHTML=@GENHTML@
+
+# When running distcheck target, do not install the configurations
+DISTCHECK_CONFIGURE_FLAGS = --disable-configuration-install
 
 clean-coverage:
 	@if [ $(USE_LCOV) = yes ] ; then \

Modified: branches/bind10-devel-20100319/configure.ac
==============================================================================
--- branches/bind10-devel-20100319/configure.ac (original)
+++ branches/bind10-devel-20100319/configure.ac Fri Mar 19 11:57:58 2010
@@ -255,6 +255,12 @@
   [regenerate man pages [default=no]])] ,enable_man=yes, enable_man=no)
 
 AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
+
+AC_ARG_ENABLE(configuration-install,
+  [AC_HELP_STRING([--enable-configuration-install],
+  [install configuration [default=yes]])], enable_configuration_install=$enableval, enable_configuration_install=no)
+
+AM_CONDITIONAL(ENABLE_CONFIGURATION_INSTALL, test x$enable_configuration_install != xno)
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile

Modified: branches/bind10-devel-20100319/src/bin/bindctl/Makefile.am
==============================================================================
--- branches/bind10-devel-20100319/src/bin/bindctl/Makefile.am (original)
+++ branches/bind10-devel-20100319/src/bin/bindctl/Makefile.am Fri Mar 19 11:57:58 2010
@@ -25,6 +25,8 @@
 	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bindctl-source.py >$@
 	chmod a+x $@
 
+if ENABLE_CONFIGURATION_INSTALL
+
 # TODO: permissions handled later
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@   
@@ -32,3 +34,4 @@
 	  $(INSTALL_DATA) $(srcdir)/bindctl.pem $(DESTDIR)$(sysconfdir)/@PACKAGE@/ ;	\
 	fi
 
+endif

Modified: branches/bind10-devel-20100319/src/bin/cmdctl/Makefile.am
==============================================================================
--- branches/bind10-devel-20100319/src/bin/cmdctl/Makefile.am (original)
+++ branches/bind10-devel-20100319/src/bin/cmdctl/Makefile.am Fri Mar 19 11:57:58 2010
@@ -14,7 +14,7 @@
 b10_cmdctl_DATA = $(CMDCTL_CONFIGURATIONS)
 b10_cmdctl_DATA += cmdctl.spec
  
-EXTRA_DIST = cmdctl-accounts.csv cmdctl-keyfile.pem cmdctl-certfile.pem
+EXTRA_DIST = $(CMDCTL_CONFIGURATIONS)
 EXTRA_DIST += cmdctl.spec
 
 CLEANFILES=	b10-cmdctl
@@ -35,6 +35,8 @@
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" cmdctl.py >$@
 	chmod a+x $@
 
+if ENABLE_CONFIGURATION_INSTALL
+
 # TODO: permissions handled later
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@   
@@ -44,3 +46,4 @@
 	  fi ;	\
 	done
 
+endif