Put ofp-pki logfile in log directory instead of in pki directory.

This should fix problems with trying to log on a machine that doesn't have
openflow-pki installed (because such machines didn't have the pki
directory).  Every machine needs the log directory.

diff --git a/Makefile.am b/Makefile.am
index 479d9b5..64827a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,8 @@ noinst_SCRIPTS =
 EXTRA_DIST += README.hwtables
 
 do_subst = ($(srcdir)/subst VLOG_OPTIONS $(srcdir)/lib/vlog.man | \
-           sed -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
+           sed -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+               -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
                 -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
                 -e 's,[@]PERL[@],$(PERL),g')

diff --git a/utilities/ofp-pki.8.in b/utilities/ofp-pki.8.in
index f9aec40..f8bd4b1 100644 (file)
--- a/utilities/ofp-pki.8.in
+++ b/utilities/ofp-pki.8.in
@@ -310,8 +310,8 @@ directories.  This option overrides this behavior.
 .TP
 \fB\-l\fR \fIfile\fR | \fB\-\^\-log=\fIfile\fR
 Sets the log file to \fIfile\fR.  If \fIfile\fR starts with \fB/\fR,
-it is taken as an absolute path; otherwise it is relative to the PKI
-hierarchy.  Default: \fBofp\-pki.log\fR.
+it is taken as an absolute path; otherwise it is relative to @LOGDIR@.
+Default: \fBofp\-pki.log\fR.
 
 .TP
 \fB\-h\fR | \fB\-\^\-help\fR

diff --git a/utilities/ofp-pki.in b/utilities/ofp-pki.in
index d347a15..3d3a00d 100755 (executable)
--- a/utilities/ofp-pki.in
+++ b/utilities/ofp-pki.in
@@ -5,7 +5,7 @@ command=
 prev=
 force=no
 batch=no
-log=ofp-pki.log
+log='@LOGDIR@/ofp-pki.log'
 keytype=rsa
 bits=2048
 for option; do