[Orca-checkins] r492 - in orca/trunk: . data_gatherers data_gatherers/orca_services data_gatherers/procallator

[blair at orcaware.com]

Author: blair at orcaware.com
Date: Thu Sep  8 21:23:43 2005
New Revision: 492

Modified:
   orca/trunk/INSTALL
   orca/trunk/Makefile.in
   orca/trunk/data_gatherers/Makefile.in
   orca/trunk/data_gatherers/orca_services/Makefile.in
   orca/trunk/data_gatherers/orca_services/README
   orca/trunk/data_gatherers/orcallator/Makefile.in
   orca/trunk/data_gatherers/procallator/Makefile.in

Log:
The make targets orcallator_run_at_boot, orca_services_run_at_boot
procallator_run_at_boot only work on systems which have chkconfig,
which are normally RedHat based ones, so append to all of the target
names the string "_using_chkconfig".  More targets for Debian based
systems will be coming.

* data_gatherers/Makefile.in,
* data_gatherers/orcallator/Makefile.in,
* data_gatherers/orca_services/Makefile.in,
* data_gatherers/procallator/Makefile.in,
* Makefile.in
  (orcallator_run_at_boot_using_chkconfig):
    Renamed from orcallator_run_at_boot.
  (orca_services_run_at_boot_using_chkconfig):
    Renamed from orca_services_run_at_boot.
  (procallator_run_at_boot_using_chkconfig):
    Renamed from procallator_run_at_boot.
  (orcallator_run_at_boot_using_chk):
    Renamed from orcallator_run_at_boot.

* INSTALL,
* data_gatherers/orca_services/README:
  Update the documentation to use the new make target names.


Modified: orca/trunk/INSTALL
==============================================================================
--- orca/trunk/INSTALL	(original)
+++ orca/trunk/INSTALL	Thu Sep  8 21:23:43 2005
@@ -349,9 +349,13 @@
        /etc/init.d/orcallator and set up symbolic links from that file
        to the appropriate K* and S* files in /etc/rc?.d/.
 
-       To make installing this easier, you can run
+       To make installing this easier, there are several make targets
+       available for different operating systems.
 
-       % make orcallator_run_at_boot
+       For systems with chkconfig, which are normally RedHat based
+       ones, run
+
+       % make orcallator_run_at_boot_using_chkconfig
 
        from either the top of the Orca source tree or from the
        data_gatherers/orcallator directory.  This will first delete
@@ -396,9 +400,13 @@
        into /etc/init.d/procallator and set up symbolic links from
        that file to the appropriate K* and S* files in /etc/rc?.d/.
 
-       To make installing this easier, you can run
+       To make installing this easier, there are several make targets
+       available for different operating systems.
+
+       For systems with chkconfig, which are normally RedHat based
+       ones, run
 
-       % make procallator_run_at_boot
+       % make procallator_run_at_boot_using_chkconfig
 
        from either the top of the Orca source tree or from the
        data_gatherers/procallator directory.  This uses Linux's

Modified: orca/trunk/Makefile.in
==============================================================================
--- orca/trunk/Makefile.in	(original)
+++ orca/trunk/Makefile.in	Thu Sep  8 21:23:43 2005
@@ -28,14 +28,14 @@
 install_contrib:
 	cd contrib && $(MAKE) install_contrib
 
-orcallator_run_at_boot:
-	cd data_gatherers/orcallator && $(MAKE) orcallator_run_at_boot
+orcallator_run_at_boot_using_chkconfig:
+	cd data_gatherers/orcallator && $(MAKE) orcallator_run_at_boot_using_chkconfig
 
-orca_services_run_at_boot:
-	cd data_gatherers/orca_services && $(MAKE) orca_services_run_at_boot
+orca_services_run_at_boot_using_chkconfig:
+	cd data_gatherers/orca_services && $(MAKE) orca_services_run_at_boot_using_chkconfig
 
-procallator_run_at_boot:
-	cd data_gatherers/procallator && $(MAKE) procallator_run_at_boot
+procallator_run_at_boot_using_chkconfig:
+	cd data_gatherers/procallator && $(MAKE) procallator_run_at_boot_using_chkconfig
 
 clean: clean-recursive clean-local
 

Modified: orca/trunk/data_gatherers/Makefile.in
==============================================================================
--- orca/trunk/data_gatherers/Makefile.in	(original)
+++ orca/trunk/data_gatherers/Makefile.in	Thu Sep  8 21:23:43 2005
@@ -29,14 +29,14 @@
 
 test: check
 
-orcallator_run_at_boot:
-	cd orcallator && $(MAKE) orcallator_run_at_boot
+orcallator_run_at_boot_using_chkconfig:
+	cd orcallator && $(MAKE) orcallator_run_at_boot_using_chkconfig
 
-orca_services_run_at_boot:
-	cd orca_services && $(MAKE) orca_services_run_at_boot
+orca_services_run_at_boot_using_chkconfig:
+	cd orca_services && $(MAKE) orca_services_run_at_boot_using_chkconfig
 
-procallator_run_at_boot:
-	cd procallator && $(MAKE) procallator_run_at_boot
+procallator_run_at_boot_using_chkconfig:
+	cd procallator && $(MAKE) procallator_run_at_boot_using_chkconfig
 
 clean: clean-recursive clean-local
 

Modified: orca/trunk/data_gatherers/orca_services/Makefile.in
==============================================================================
--- orca/trunk/data_gatherers/orca_services/Makefile.in	(original)
+++ orca/trunk/data_gatherers/orca_services/Makefile.in	Thu Sep  8 21:23:43 2005
@@ -68,7 +68,7 @@
 	  $(INSTALL) -m 0644 orca_services.cfg $(DESTDIR)$(sysconfdir) || exit 1; \
 	fi
 
-orca_services_run_at_boot: all
+orca_services_run_at_boot_using_chkconfig: all
 	test "$(INIT_D_DIR)"
 	test "$(RCX_D_CONTAINING_DIR)"
 	-$(RM) $(INIT_D_DIR)/orca_services

Modified: orca/trunk/data_gatherers/orca_services/README
==============================================================================
--- orca/trunk/data_gatherers/orca_services/README	(original)
+++ orca/trunk/data_gatherers/orca_services/README	Thu Sep  8 21:23:43 2005
@@ -75,9 +75,10 @@
    make
    make install
 
-   * if orca_services should run at boottime
+   If orca_services should run at boot time, for systems with chkconfig,
+   which are normally RedHat based systems, run
 
-   make orca_services_run_at_boot
+   make orca_services_run_at_boot_using_chkconfig
 
    Most of the skeleton code of orca_services comes from orcallator. So
    everything is very similar.

Modified: orca/trunk/data_gatherers/orcallator/Makefile.in
==============================================================================
--- orca/trunk/data_gatherers/orcallator/Makefile.in	(original)
+++ orca/trunk/data_gatherers/orcallator/Makefile.in	Thu Sep  8 21:23:43 2005
@@ -66,7 +66,7 @@
 	  $(INSTALL) -m 0644 orcallator.cfg $(DESTDIR)$(sysconfdir) || exit 1; \
 	fi
 
-orcallator_run_at_boot: all
+orcallator_run_at_boot_using_chkconfig: all
 	test "$(INIT_D_DIR)"
 	test "$(RCX_D_CONTAINING_DIR)"
 	-$(RM) $(INIT_D_DIR)/orcallator

Modified: orca/trunk/data_gatherers/procallator/Makefile.in
==============================================================================
--- orca/trunk/data_gatherers/procallator/Makefile.in	(original)
+++ orca/trunk/data_gatherers/procallator/Makefile.in	Thu Sep  8 21:23:43 2005
@@ -62,7 +62,7 @@
 	  $(INSTALL) -m 0644 procallator.cfg $(DESTDIR)$(sysconfdir) || exit 1; \
 	fi
 
-procallator_run_at_boot: all
+procallator_run_at_boot_using_chkconfig: all
 	test "$(INIT_D_DIR)"
 	-$(RM) $(INIT_D_DIR)/procallator
 	$(INSTALL) -m 0744 S99procallator $(INIT_D_DIR)/procallator