mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 06:55:16 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jeremy C. Reed
2010-03-19 04:47:16 +00:00
parent 6ede2d9c1c
commit f6fb5e78cd
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@@ -3,6 +3,9 @@ USE_LCOV=@USE_LCOV@
LCOV=@LCOV@ LCOV=@LCOV@
GENHTML=@GENHTML@ GENHTML=@GENHTML@
# When running distcheck target, do not install the configurations
DISTCHECK_CONFIGURE_FLAGS = --disable-configuration-install
clean-coverage: clean-coverage:
@if [ $(USE_LCOV) = yes ] ; then \ @if [ $(USE_LCOV) = yes ] ; then \
$(LCOV) --directory . --zerocounters; \ $(LCOV) --directory . --zerocounters; \

6
configure.ac
View File

@@ -256,6 +256,12 @@ AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man],
AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno) 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 AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
src/bin/Makefile src/bin/Makefile

3
src/bin/bindctl/Makefile.am
View File

@@ -25,6 +25,8 @@ bindctl: bindctl-source.py
-e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bindctl-source.py >$@ -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bindctl-source.py >$@
chmod a+x $@ chmod a+x $@
if ENABLE_CONFIGURATION_INSTALL
# TODO: permissions handled later # TODO: permissions handled later
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@ $(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@
@@ -32,3 +34,4 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/bindctl.pem $(DESTDIR)$(sysconfdir)/@PACKAGE@/ ; \ $(INSTALL_DATA) $(srcdir)/bindctl.pem $(DESTDIR)$(sysconfdir)/@PACKAGE@/ ; \
fi fi
endif

5
src/bin/cmdctl/Makefile.am
View File

@@ -14,7 +14,7 @@ CMDCTL_CONFIGURATIONS += cmdctl-keyfile.pem cmdctl-certfile.pem
b10_cmdctl_DATA = $(CMDCTL_CONFIGURATIONS) b10_cmdctl_DATA = $(CMDCTL_CONFIGURATIONS)
b10_cmdctl_DATA += cmdctl.spec b10_cmdctl_DATA += cmdctl.spec
EXTRA_DIST = cmdctl-accounts.csv cmdctl-keyfile.pem cmdctl-certfile.pem EXTRA_DIST = $(CMDCTL_CONFIGURATIONS)
EXTRA_DIST += cmdctl.spec EXTRA_DIST += cmdctl.spec
CLEANFILES= b10-cmdctl CLEANFILES= b10-cmdctl
@@ -35,6 +35,8 @@ b10-cmdctl: cmdctl.py
$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" cmdctl.py >$@ $(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" cmdctl.py >$@
chmod a+x $@ chmod a+x $@
if ENABLE_CONFIGURATION_INSTALL
# TODO: permissions handled later # TODO: permissions handled later
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@ $(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@
@@ -44,3 +46,4 @@ install-data-local:
fi ; \ fi ; \
done done
endif