Cluster Project branch, master, updated. cluster-2.99.06-41-g4c05bff

[fabbione@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=4c05bff7a76b6909b350b2d4d1ad06f48f968510

The branch, master has been updated
       via  4c05bff7a76b6909b350b2d4d1ad06f48f968510 (commit)
      from  b3877bc1cb5e24c72a480f48ef05b008471c6627 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4c05bff7a76b6909b350b2d4d1ad06f48f968510
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Tue Jul 22 07:07:18 2008 +0200

    [BUILD] Fix LOGDIR usage
    
    LOGDIR was duplicate of logdir. Remove the duplication and use logdir as
    it should be.
    
    Also add logdir info to fencebuild, required for fence_apc_snmp
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile          |    2 +-
 make/defines.mk.input |    2 --
 make/fencebuild.mk    |    1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index c54358b..10a076c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -20,7 +20,7 @@ include $(OBJDIR)/make/clean.mk
 
 $(TARGET):
 	cat $(S)/$(TARGET).logrotate.in | sed \
-		-e 's#@LOGDIR@#${LOGDIR}#g' \
+		-e 's#@LOGDIR@#${logdir}#g' \
 	> $(TARGET)
 
 clean: generalclean
diff --git a/make/defines.mk.input b/make/defines.mk.input
index f24a82b..0a457f1 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -88,7 +88,5 @@ S=$(SRCDIR)/$(THISDIR)
 CONFDIR=@CONFDIR@
 CONFFILE=@CONFFILE@
 
-LOGDIR=@LOGDIR@
-
 UNINSTALL = perl @SRCDIR@/scripts/uninstall.pl
 FENCEPARSE = bash @SRCDIR@/scripts/fenceparse
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 34a8550..73fd26b 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 $@


hooks/post-receive
--
Cluster Project