Rev 518: install man page in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 518
revision-id: tridge at samba.org-20070609052130-7kxgjidk0a3frpdc
parent: tridge at samba.org-20070609051105-qttmz36qj1fsfrqh
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Sat 2007-06-09 15:21:30 +1000
message:
  install man page
modified:
  Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
  packaging/RPM/ctdb.spec        ctdb.spec-20070527204758-biuh7znabuwan3zn-3
=== modified file 'Makefile.in'
--- a/Makefile.in	2007-06-08 22:41:36 +0000
+++ b/Makefile.in	2007-06-09 05:21:30 +0000
@@ -8,6 +8,7 @@
 libdir = @libdir@
 bindir = @bindir@
 sbindir = @sbindir@
+mandir = @mandir@
 localstatedir = @localstatedir@
 VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
 srcdir = @srcdir@
@@ -16,6 +17,7 @@
 DESTDIR = /
 EXTRA_OBJ=@EXTRA_OBJ@
 XSLTPROC = /usr/bin/xsltproc
+INSTALLCMD = @INSTALL@
 
 POPT_LIBS = @POPT_LIBS@
 POPT_CFLAGS = @POPT_CFLAGS@
@@ -56,7 +58,7 @@
 
 DIRS = lib bin
 
-all: showflags dirs $(CTDB_SERVER_OBJ) $(CTDB_CLIENT_OBJ) $(BINS) $(SBINS) $(TEST_BINS)
+all: showflags dirs doc $(CTDB_SERVER_OBJ) $(CTDB_CLIENT_OBJ) $(BINS) $(SBINS) $(TEST_BINS)
 
 showflags:
 	@echo 'ctdb will be compiled with flags:'
@@ -115,20 +117,22 @@
 	mkdir -p $(DESTDIR)$(includedir)
 	mkdir -p $(DESTDIR)$(etcdir)/ctdb
 	mkdir -p $(DESTDIR)$(etcdir)/ctdb/events.d
-	install -m755 bin/ctdb $(DESTDIR)$(bindir)
-	install -m755 bin/ctdbd $(DESTDIR)$(sbindir)
-	install -m644 include/ctdb.h $(DESTDIR)$(includedir)
-	install -m644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3
-	install -m755 config/events $(DESTDIR)$(etcdir)/ctdb
-	install -m755 config/functions $(DESTDIR)$(etcdir)/ctdb
-	install -m755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb
-	install -m755 config/events.d/10.interface $(DESTDIR)$(etcdir)/ctdb/events.d
-	install -m755 config/events.d/40.vsftpd $(DESTDIR)$(etcdir)/ctdb/events.d
-	install -m755 config/events.d/50.samba $(DESTDIR)$(etcdir)/ctdb/events.d
-	install -m755 config/events.d/59.nfslock $(DESTDIR)$(etcdir)/ctdb/events.d
-	install -m755 config/events.d/60.nfs $(DESTDIR)$(etcdir)/ctdb/events.d
-	install -m755 tools/onnode.ssh $(DESTDIR)$(bindir)
-	install -m755 tools/onnode.rsh $(DESTDIR)$(bindir)
+	${INSTALLCMD} -m755 bin/ctdb $(DESTDIR)$(bindir)
+	${INSTALLCMD} -m755 bin/ctdbd $(DESTDIR)$(sbindir)
+	${INSTALLCMD} -m644 include/ctdb.h $(DESTDIR)$(includedir)
+	${INSTALLCMD} -m644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3
+	${INSTALLCMD} -m755 config/events $(DESTDIR)$(etcdir)/ctdb
+	${INSTALLCMD} -m755 config/functions $(DESTDIR)$(etcdir)/ctdb
+	${INSTALLCMD} -m755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb
+	${INSTALLCMD} -m755 config/events.d/10.interface $(DESTDIR)$(etcdir)/ctdb/events.d
+	${INSTALLCMD} -m755 config/events.d/40.vsftpd $(DESTDIR)$(etcdir)/ctdb/events.d
+	${INSTALLCMD} -m755 config/events.d/50.samba $(DESTDIR)$(etcdir)/ctdb/events.d
+	${INSTALLCMD} -m755 config/events.d/59.nfslock $(DESTDIR)$(etcdir)/ctdb/events.d
+	${INSTALLCMD} -m755 config/events.d/60.nfs $(DESTDIR)$(etcdir)/ctdb/events.d
+	${INSTALLCMD} -m755 tools/onnode.ssh $(DESTDIR)$(bindir)
+	${INSTALLCMD} -m755 tools/onnode.rsh $(DESTDIR)$(bindir)
+	if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi
+	if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -m 644 doc/ctdb.1 $(DESTDIR)$(mandir)/man1; fi
 	cd $(DESTDIR)$(bindir) && ln -sf onnode.ssh onnode
 
 test: all

=== modified file 'packaging/RPM/ctdb.spec'
--- a/packaging/RPM/ctdb.spec	2007-06-07 05:25:36 +0000
+++ b/packaging/RPM/ctdb.spec	2007-06-09 05:21:30 +0000
@@ -5,7 +5,7 @@
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0
-Release: 3
+Release: 4
 Epoch: 0
 License: GNU GPL version 2
 Group: System Environment/Daemons
@@ -104,5 +104,6 @@
 %{_bindir}/onnode.ssh
 %{_bindir}/onnode.rsh
 %{_bindir}/onnode
+%{_mandir}/man1/ctdb.1
 %{_includedir}/ctdb.h
 %{_includedir}/ctdb_private.h