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

[master] Fix cmdctl pem and csv file installation

Browse Source 
They were installed twice (to /etc and to /share, removed the latter)
Also, the generated .pem files were included in the tarball, while they should be generated during the build process
This commit is contained in:
Jelte Jansen
2013-02-04 23:18:42 +01:00
parent 8eb3dbe543
commit d1ae5b1575
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,17 +11,12 @@ pylogmessagedir = $(pyexecdir)/isc/log_messages/
b10_cmdctldir = $(pkgdatadir) b10_cmdctldir = $(pkgdatadir)
# NOTE: this will overwrite on install USERSFILES = cmdctl-accounts.csv
# So these generic copies are placed in share/bind10 instead of to etc CERTFILES = cmdctl-keyfile.pem cmdctl-certfile.pem
# Admin or packageer will need to put into place manually.
CMDCTL_CONFIGURATIONS = cmdctl-accounts.csv b10_cmdctl_DATA = cmdctl.spec
CMDCTL_CONFIGURATIONS += cmdctl-keyfile.pem cmdctl-certfile.pem
b10_cmdctl_DATA = $(CMDCTL_CONFIGURATIONS) EXTRA_DIST = $(USERSFILES)
b10_cmdctl_DATA += cmdctl.spec
EXTRA_DIST = $(CMDCTL_CONFIGURATIONS)
CLEANFILES= b10-cmdctl cmdctl.pyc cmdctl.spec CLEANFILES= b10-cmdctl cmdctl.pyc cmdctl.spec
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py
@@ -55,7 +50,7 @@ $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py : cmdctl_messages.mes
-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/cmdctl_messages.mes -d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/cmdctl_messages.mes
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
b10-cmdctl: cmdctl.py $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py b10-cmdctl: cmdctl.py $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py $(CERTFILES)
$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" cmdctl.py >$@ $(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" cmdctl.py >$@
chmod a+x $@ chmod a+x $@
@@ -76,7 +71,7 @@ if INSTALL_CONFIGURATIONS
# because these file will contain sensitive information. # because these file will contain sensitive information.
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@ $(mkinstalldirs) $(DESTDIR)/@sysconfdir@/@PACKAGE@
for f in $(CMDCTL_CONFIGURATIONS) ; do \ for f in $(USERSFILES) $(CERTFILES) ; do \
if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \ if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \
${INSTALL} -m 640 $(srcdir)/$$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/ ; \ ${INSTALL} -m 640 $(srcdir)/$$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/ ; \
fi ; \ fi ; \