tidy up the install somewhat

(This used to be ctdb commit 07e202ae8451ffa67c40973625996224cfd4e158)

3 files changed, 15 insertions, 26 deletions

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index f07324920c..c818336498 100644
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -117,9 +117,19 @@ distclean: clean
 install: all
 	mkdir -p $(DESTDIR)$(bindir)
 	mkdir -p $(DESTDIR)$(includedir)
-	rsync $(BINS) $(DESTDIR)$(bindir)
-	rsync $(SBINS) $(DESTDIR)$(sbindir)
-	rsync $(srcdir)/include/ctdb.h $(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 tools/events $(DESTDIR)$(etcdir)/ctdb
+	install -m755 tools/statd-callout $(DESTDIR)$(etcdir)/ctdb
+	install -m755 tools/events.d/samba $(DESTDIR)$(etcdir)/ctdb/events.d
+	install -m755 tools/events.d/nfslock $(DESTDIR)$(etcdir)/ctdb/events.d
+	install -m755 tools/onnode.ssh $(DESTDIR)$(bindir)
+	install -m755 tools/onnode.rsh $(DESTDIR)$(bindir)
+	ln -sf $(DESTDIR)$(bindir)/onnode.ssh $(DESTDIR)$(bindir)/onnode
 
 test: all
 	tests/run_tests.sh
diff --git a/ctdb/packaging/RHEL/ctdb.spec b/ctdb/packaging/RHEL/ctdb.spec
index c8eaabf3d9..3c60d61510 100644
--- a/ctdb/packaging/RHEL/ctdb.spec
+++ b/ctdb/packaging/RHEL/ctdb.spec
@@ -9,12 +9,12 @@ Release: 1
 Epoch: 0
 License: GNU GPL version 2
 Group: System Environment/Daemons
-URL: bzr://www.samba.org/~tridge/ctdb/
+URL: http://ctdb.samba.org/
 
 Source: ctdb-%{version}.tar.bz2
 Source999: ctdb-setup.tar.bz2
 
-Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
+Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall /usr/bin/nc
 Prereq: fileutils sed /etc/init.d
 
 Requires: initscripts >= 5.54-1
@@ -66,17 +66,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 install -m644 setup/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
 install -m755 setup/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
-install -m755 tools/events $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events
-install -m755 tools/events.d/samba $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events.d/samba
-install -m755 tools/events.d/nfslock $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events.d/nfslock
-install -m755 tools/statd-callout $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/statd-callout
-install -m755 tools/onnode.ssh $RPM_BUILD_ROOT%{_bindir}
-install -m755 tools/onnode.rsh $RPM_BUILD_ROOT%{_bindir}
-ln -sf %{_bindir}/onnode.ssh $RPM_BUILD_ROOT%{_bindir}/onnode
-
-# unfortunately samba3 needs ctdb_private.h too
-install -m644 include/ctdb_private.h $RPM_BUILD_ROOT%{_includedir}/ctdb_private.h
-
 
 # Remove "*.old" files
 find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
diff --git a/ctdb/packaging/RHEL/setup/ctdb.sysconfig b/ctdb/packaging/RHEL/setup/ctdb.sysconfig
index fdcbfbe8e0..595a468044 100644
--- a/ctdb/packaging/RHEL/setup/ctdb.sysconfig
+++ b/ctdb/packaging/RHEL/setup/ctdb.sysconfig
@@ -42,16 +42,6 @@
 # the default is 0
 # DEBUGLEVEL=0
 
-# use this to specify any local tcp ports to wait on before starting
-# ctdb. Use 445 and 139 for Samba
-# the default is not to wait for any local services
-# CTDB_WAIT_TCP_PORTS="445 139"
-
-# use this to specify any local directories to wait on before starting
-# ctdb. You should list any critical Samba or NFS shared directories 
-# the default is not to wait for any local directories
-# CTDB_WAIT_DIRECTORIES="/some/directory"
-
 # the shared directory where you want to put statd information on
 # which clients to notify on a NFS restart
 # there is no default