Commit 4babde87 authored by Jeremy C. Reed's avatar Jeremy C. Reed

Fix the configuration installs.

Now use --disable-install-configurations to disable.
It still checks before overwriting.


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1590 e5f2f494-b856-4b98-b285-d166d9295462
parent a50554e4
......@@ -4,7 +4,7 @@ LCOV=@LCOV@
GENHTML=@GENHTML@
# When running distcheck target, do not install the configurations
DISTCHECK_CONFIGURE_FLAGS = --disable-configuration-install
DISTCHECK_CONFIGURE_FLAGS = --disable-install-configurations
clean-coverage:
@if [ $(USE_LCOV) = yes ] ; then \
......
......@@ -256,11 +256,11 @@ AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man],
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)
AC_ARG_ENABLE(install-configurations,
[AC_HELP_STRING([--disable-install-configurations],
[do not install configuration])], install_configurations=$enableval, install_configurations=yes)
AM_CONDITIONAL(ENABLE_CONFIGURATION_INSTALL, test x$enable_configuration_install != xno)
AM_CONDITIONAL(INSTALL_CONFIGURATIONS, test x$install_configurations = xyes || test x$install_configurations = xtrue)
AC_CONFIG_FILES([Makefile
src/Makefile
......
......@@ -25,7 +25,7 @@ bindctl: bindctl-source.py
-e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bindctl-source.py >$@
chmod a+x $@
if ENABLE_CONFIGURATION_INSTALL
if INSTALL_CONFIGURATIONS
# TODO: permissions handled later
install-data-local:
......
......@@ -35,7 +35,7 @@ b10-cmdctl: cmdctl.py
$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" cmdctl.py >$@
chmod a+x $@
if ENABLE_CONFIGURATION_INSTALL
if INSTALL_CONFIGURATIONS
# TODO: permissions handled later
install-data-local:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment