Cluster Project branch, master, updated. cluster-2.99.05-36-gf174491
fabbione@sourceware.org
fabbione@sourceware.org
Tue Jul 1 08:10:00 GMT 2008
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=f174491f5e9211bcdc21be79b63c4b1bf73766c0
The branch, master has been updated
via f174491f5e9211bcdc21be79b63c4b1bf73766c0 (commit)
via 22c2a16afa11dc2a7ed41fbc614a17d0a5a2d7ab (commit)
via 9632e1903470294781413424ccdeda75928a9abd (commit)
via 3051ed6bf51b4ae03457730f5427a0855f5940b4 (commit)
via e993c62aedc278f78aabde413079d36aac744d1e (commit)
from e825697b96688864f2f908e9e7b480133741ecd8 (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 f174491f5e9211bcdc21be79b63c4b1bf73766c0
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Tue Jul 1 10:07:02 2008 +0200
[MISC] Documentation cleanup
Move all licence and copyright bits into doc/
Add doc/Makefile and use DOCS= infrastructure to install all
documentation.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
commit 22c2a16afa11dc2a7ed41fbc614a17d0a5a2d7ab
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Tue Jul 1 09:59:41 2008 +0200
[BUILD] Install ldap schemas and example in document directory
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
commit 9632e1903470294781413424ccdeda75928a9abd
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Tue Jul 1 09:59:00 2008 +0200
[BUILD] Add install/uninstall snippets for documents
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
commit 3051ed6bf51b4ae03457730f5427a0855f5940b4
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Tue Jul 1 09:58:35 2008 +0200
[BUILD] Fix docdir default path
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
commit e993c62aedc278f78aabde413079d36aac744d1e
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Tue Jul 1 09:47:05 2008 +0200
[BUILD] Allow configuration of docdir
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 ++-
config/plugins/ldap/Makefile | 3 +++
configure | 7 +++++++
COPYING.applications => doc/COPYING.applications | 0
COPYING.libraries => doc/COPYING.libraries | 0
COPYRIGHT => doc/COPYRIGHT | 0
doc/Makefile | 17 +++++++++++++++++
README.licence => doc/README.licence | 0
make/defines.mk.input | 1 +
make/install.mk | 4 ++++
make/uninstall.mk | 3 +++
11 files changed, 37 insertions(+), 1 deletions(-)
rename COPYING.applications => doc/COPYING.applications (100%)
rename COPYING.libraries => doc/COPYING.libraries (100%)
rename COPYRIGHT => doc/COPYRIGHT (100%)
create mode 100644 doc/Makefile
rename README.licence => doc/README.licence (100%)
diff --git a/Makefile b/Makefile
index ab90beb..fe644e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
include make/defines.mk
REALSUBDIRS = gnbd-kernel/src gfs-kernel/src/gfs \
- config cman ccs dlm fence/libfenced group fence gfs gfs2 gnbd rgmanager bindings
+ config cman ccs dlm fence/libfenced group \
+ fence gfs gfs2 gnbd rgmanager bindings doc
SUBDIRS = $(filter-out \
$(if ${without_gnbd-kernel/src},gnbd-kernel/src) \
diff --git a/config/plugins/ldap/Makefile b/config/plugins/ldap/Makefile
index 1589998..aff2558 100644
--- a/config/plugins/ldap/Makefile
+++ b/config/plugins/ldap/Makefile
@@ -2,6 +2,9 @@ TARGET= config_ldap.lcrso
LCRSOT=$(TARGET)
+DOCS = 99cluster.ldif \
+ example.ldif
+
all: ${TARGET}
include ../../../make/defines.mk
diff --git a/configure b/configure
index 02bc57d..2a497e3 100755
--- a/configure
+++ b/configure
@@ -69,6 +69,7 @@ my %options = (
sbindir => \$sbindir,
initddir => \$initddir,
sharedir => \$sharedir,
+ docdir => \$docdir,
logdir => \$logdir,
syslogfacility => \$syslogfacility,
mibdir => \$mibdir,
@@ -149,6 +150,7 @@ my $err = &GetOptions (\%options,
'sbindir=s',
'initddir=s',
'sharedir=s',
+ 'docdir=s',
'logdir=s',
'syslogfacility=s',
'mibdir=s',
@@ -193,6 +195,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 "--docdir=\tthe base directory for misc cluster documentation files. (Default: {prefix}/share/doc/cluster)\n";
print "--logdir=\tthe base directory for cluster logging files. (Default: /var/log/cluster/)\n";
print "--syslogfacility=\tset the default syslog facility. (Default: LOG_LOCAL4)\n";
print "--mibdir=\tthe base directory for snmp mibs. (Default: {prefix}/share/snmp/mibs)\n";
@@ -521,6 +524,9 @@ if (!$initddir) {
if (!$sharedir) {
$sharedir="${prefix}/share/cluster";
}
+if (!$docdir) {
+ $docdir="${prefix}/share/doc/cluster";
+}
if (!$logdir) {
$logdir="/var/log/cluster";
}
@@ -683,6 +689,7 @@ while (<IFILE>) {
$_ =~ s/\@SBINDIR\@/$sbindir/;
$_ =~ s/\@INITDDIR\@/$initddir/;
$_ =~ s/\@SHAREDIR\@/$sharedir/;
+ $_ =~ s/\@DOCDIR\@/$docdir/;
$_ =~ s/\@LOGDIR\@/$logdir/;
$_ =~ s/\@SYSLOGFACILITY\@/$syslogfacility/;
$_ =~ s/\@MIBDIR\@/$mibdir/;
diff --git a/COPYING.applications b/doc/COPYING.applications
similarity index 100%
rename from COPYING.applications
rename to doc/COPYING.applications
diff --git a/COPYING.libraries b/doc/COPYING.libraries
similarity index 100%
rename from COPYING.libraries
rename to doc/COPYING.libraries
diff --git a/COPYRIGHT b/doc/COPYRIGHT
similarity index 100%
rename from COPYRIGHT
rename to doc/COPYRIGHT
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 0000000..db61e0b
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,17 @@
+DOCS = gfs2.txt \
+ journaling.txt \
+ min-gfs.txt \
+ usage.txt \
+ COPYING.applications \
+ COPYING.libraries \
+ COPYRIGHT \
+ README.licence
+
+all:
+
+include ../make/defines.mk
+include $(OBJDIR)/make/install.mk
+include $(OBJDIR)/make/uninstall.mk
+include $(OBJDIR)/make/clean.mk
+
+clean: generalclean
diff --git a/README.licence b/doc/README.licence
similarity index 100%
rename from README.licence
rename to doc/README.licence
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 16da217..7b49131 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@
+docdir ?= ${DESTDIR}@DOCDIR@
logdir ?= ${DESTDIR}@LOGDIR@
mandir ?= ${DESTDIR}@MANDIR@
module_dir ?= @MODULE_DIR@
diff --git a/make/install.mk b/make/install.mk
index e1babaf..964b72b 100644
--- a/make/install.mk
+++ b/make/install.mk
@@ -55,3 +55,7 @@ ifdef FENCEAGENTSLIB
install -d ${DESTDIR}/${fenceagentslibdir}
install -m644 ${FENCEAGENTSLIB} ${DESTDIR}/${fenceagentslibdir}
endif
+ifdef DOCS
+ install -d ${docdir}
+ install -m644 $(S)/${DOCS} ${docdir}
+endif
diff --git a/make/uninstall.mk b/make/uninstall.mk
index 9e64522..b54ac85 100644
--- a/make/uninstall.mk
+++ b/make/uninstall.mk
@@ -35,3 +35,6 @@ endif
ifdef FENCEAGENTSLIB
${UNINSTALL} ${FENCEAGENTSLIB}* ${DESTDIR}/${fenceagentslibdir}
endif
+ifdef DOCS
+ ${UNINSTALL} ${DOCS} ${docdir}
+endif
hooks/post-receive
--
Cluster Project
More information about the Cluster-cvs
mailing list