STABLE2 - [BUILD] Allow users to set default log dir

["Fabio M. Di Nitto" <fabbione at fedoraproject dot org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=40b61d8e7943f65831544940b893892192416ac3
Commit:        40b61d8e7943f65831544940b893892192416ac3
Parent:        40be4e735d48bd3de9001fb5874778bffe96dd52
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Tue Oct 21 06:05:12 2008 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue Oct 21 06:05:12 2008 +0200

[BUILD] Allow users to set default log dir

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 configure             |    7 +++++++
 make/defines.mk.input |    2 ++
 make/fencebuild.mk    |    1 +
 3 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index c121b3e..36be925 100755
--- a/configure
+++ b/configure
@@ -66,6 +66,7 @@ my %options = (
 	sbindir => \$sbindir,
 	initddir => \$initddir,
 	sharedir => \$sharedir,
+	logdir => \$logdir,
 	docdir => \$docdir,
 	mibdir => \$mibdir,
 	snmpbin => \$snmpbin,
@@ -138,6 +139,7 @@ my $err = &GetOptions (\%options,
 		    'sbindir=s',
 		    'initddir=s',
 		    'sharedir=s',
+		    'logdir=s',
 		    'docdir=s',
 		    'mibdir=s',
 		    'snmpbin=s',
@@ -179,6 +181,7 @@ if ($help || !$err) {
   print "--libdir=\tthe base directory for libraries.  (Default: {prefix}/lib)\n";
   print "--libexecdir=\tthe base directory for executable components.  (Default: {prefix}/libexec)\n";
   print "--sharedir=\tthe base directory for misc cluster files.  (Default: {prefix}/share/cluster)\n";
+  print "--logdir=\tthe base directory for cluster logging files.  (Default: /var/log/cluster/)\n";
   print "--docdir=\tthe base directory for misc cluster documentation files.  (Default: {prefix}/share/doc/cluster)\n";
   print "--mibdir=\tthe base directory for snmp mibs.  (Default: {prefix}/share/snmp/mibs)\n";
   print "--snmpbin=\tthe base directory for snmp binaries (Ex: /usr/bin/snmpwalk).  (Default: {prefix}/bin)\n";
@@ -487,6 +490,9 @@ if (!$initddir) {
 if (!$sharedir) {
   $sharedir="${prefix}/share/cluster";
 }
+if (!$logdir) {
+  $logdir="/var/log/cluster";
+}
 if (!$docdir) {
   $docdir="${prefix}/share/doc/cluster";
 }
@@ -629,6 +635,7 @@ while (<IFILE>) {
   $_ =~ s/\@SBINDIR\@/$sbindir/;
   $_ =~ s/\@INITDDIR\@/$initddir/;
   $_ =~ s/\@SHAREDIR\@/$sharedir/;
+  $_ =~ s/\@LOGDIR\@/$logdir/;
   $_ =~ s/\@DOCDIR\@/$docdir/;
   $_ =~ s/\@MIBDIR\@/$mibdir/;
   $_ =~ s/\@SNMPBIN\@/$snmpbin/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index a4fa193..ed4f72d 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -4,6 +4,7 @@ initddir ?= ${DESTDIR}@INITDDIR@
 libdir ?= ${DESTDIR}@LIBDIR@
 libexecdir ?= ${DESTDIR}@LIBEXECDIR@
 sharedir ?= ${DESTDIR}@SHAREDIR@
+logdir ?= ${DESTDIR}@LOGDIR@
 docdir ?= ${DESTDIR}@DOCDIR@
 mandir ?= ${DESTDIR}@MANDIR@
 module_dir ?= @MODULE_DIR@
@@ -20,6 +21,7 @@ RANLIB = ranlib
 
 CFLAGS += @CFLAGS@ -I@SRCDIR@/config 
 CFLAGS += -DDEFAULT_CONFIG_DIR=\"@CONFDIR@\" -DDEFAULT_CONFIG_FILE=\"@CONFFILE@\"
+CFLAGS += -DLOGDIR=\"@LOGDIR@\"
 LDFLAGS += @LDFLAGS@
 
 SRCDIR = @SRCDIR@
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 2dcfeb9..ffc1f43 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -19,6 +19,7 @@ $(TARGET):
 		-e 's#@FENCEAGENTSLIBDIR@#${fenceagentslibdir}#g' \
 		-e 's#@MIBDIR@#${mibdir}#g' \
 		-e 's#@SNMPBIN@#${snmpbin}#g' \
+		-e 's#@LOGDIR@#${logdir}#g' \
 	> $@
 
 	chmod +x $@