Commit f6fb5e78 authored by Jeremy C. Reed's avatar Jeremy C. Reed

add configure switch --disable-configuration-install so can be used

for DISTCHECK_CONFIGURE_FLAGS to disable the custom installation
of configurations, so the make distcheck uninstall doesn't have
leftover files.



git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1570 e5f2f494-b856-4b98-b285-d166d9295462
parent 6ede2d9c
......@@ -3,6 +3,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 \
$(LCOV) --directory . --zerocounters; \
......
......@@ -256,6 +256,12 @@ 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)
AM_CONDITIONAL(ENABLE_CONFIGURATION_INSTALL, test x$enable_configuration_install != xno)
AC_CONFIG_FILES([Makefile
src/Makefile
src/bin/Makefile
......
......@@ -25,6 +25,8 @@ bindctl: bindctl-source.py
-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-local:
$(INSTALL_DATA) $(srcdir)/bindctl.pem $(DESTDIR)$(sysconfdir)/@PACKAGE@/ ; \
fi
endif
......@@ -14,7 +14,7 @@ CMDCTL_CONFIGURATIONS += cmdctl-keyfile.pem cmdctl-certfile.pem
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 @@ b10-cmdctl: cmdctl.py
$(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 @@ install-data-local:
fi ; \
done
endif
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