Log Message:
-----------
Altperl fixes to paths per cedricOB

Tags:
----
REL_1_2_STABLE

Modified Files:
--------------
    slony1-engine/tools/altperl:
        Makefile (r1.14 -> r1.14.2.1)
        show_configuration.pl (r1.7 -> r1.7.4.1)
        slon-tools.pm (r1.26.2.1 -> r1.26.2.2)
        slon_watchdog.pl (r1.12 -> r1.12.2.1)
        slon_watchdog2.pl (r1.9 -> r1.9.4.1)

-------------- next part --------------
Index: slon_watchdog2.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_watchdog2.pl,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -Ltools/altperl/slon_watchdog2.pl -Ltools/altperl/slon_watchdog2.pl -u -w -r1.9 -r1.9.4.1
--- tools/altperl/slon_watchdog2.pl
+++ tools/altperl/slon_watchdog2.pl
@@ -54,7 +54,7 @@
   # If the node needs a swift kick in the "RESTART", then submit that to slonik
   if ($kick eq "YES") {
     log_to_watchdog_log("submit slonik to restart $CLUSTER_NAME node $nodenum");
-    open(SLONIK, "|@@PGBINDIR@@/slonik");
+    open(SLONIK, "|@@SLONBINDIR@@/slonik");
     print SLONIK genheader();
     print SLONIK "restart node $node\n";
     close SLONIK;
Index: slon-tools.pm
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon-tools.pm,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -Ltools/altperl/slon-tools.pm -Ltools/altperl/slon-tools.pm -u -w -r1.26.2.1 -r1.26.2.2
--- tools/altperl/slon-tools.pm
+++ tools/altperl/slon-tools.pm
@@ -133,7 +133,7 @@
   my ($dsn, $dbname) = ($DSN[$nodenum], $DBNAME[$nodenum]);
   $SYNC_CHECK_INTERVAL ||= 1000;
   system("mkdir -p $LOGDIR/slony1/node$nodenum");
-  my $cmd = "@@PGBINDIR@@/slon -s $SYNC_CHECK_INTERVAL -d2 $CLUSTER_NAME '$dsn' 2>&1 ";
+  my $cmd = "@@SLONBINDIR@@/slon -s $SYNC_CHECK_INTERVAL -d2 $CLUSTER_NAME '$dsn' 2>&1 ";
   if ($APACHE_ROTATOR) {
     $cmd .= "| $APACHE_ROTATOR \"$LOGDIR/slony1/node$nodenum/" .  $dbname . "_%Y-%m-%d_%H:%M:%S.log\" 10M &";
   } else {
Index: slon_watchdog.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_watchdog.pl,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -Ltools/altperl/slon_watchdog.pl -Ltools/altperl/slon_watchdog.pl -u -w -r1.12 -r1.12.2.1
--- tools/altperl/slon_watchdog.pl
+++ tools/altperl/slon_watchdog.pl
@@ -48,7 +48,7 @@
     print SLONLOG "WATCHDOG: You ought to check the postmaster and slon for evidence of a crash!\n";
     print SLONLOG "WATCHDOG: I'm going to restart slon for $node...\n";
     # First, restart the node using slonik
-    system "@@TOOLSBIN@@/slonik_restart_node $node | @@PGBINDIR@@/slonik";
+    system "@@TOOLSBIN@@/slonik_restart_node $node | @@SLONBINDIR@@/slonik";
     # Next, restart the slon process to service the node
     start_slon($nodenum);
     $pid = get_pid($node);
Index: show_configuration.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/show_configuration.pl,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -Ltools/altperl/show_configuration.pl -Ltools/altperl/show_configuration.pl -u -w -r1.7 -r1.7.4.1
--- tools/altperl/show_configuration.pl
+++ tools/altperl/show_configuration.pl
@@ -40,7 +40,7 @@
 print qq{
 Slony-I Cluster: $CLUSTER_NAME
 Logs stored under $LOGDIR
-Slony Binaries in: @@PGBINDIR@@
+Slony Binaries in: @@SLONBINDIR@@
 };
 if ($APACHE_ROTATOR) {
   print "Rotating logs using Apache Rotator: $APACHE_ROTATOR\n";
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/Makefile,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -Ltools/altperl/Makefile -Ltools/altperl/Makefile -u -w -r1.14 -r1.14.2.1
--- tools/altperl/Makefile
+++ tools/altperl/Makefile
@@ -28,6 +28,7 @@
                        -e "s#@@SYSCONFDIR@@#$(sysconfdir)#;" \
                        -e "s#@@PGLIBDIR@@#$(pglibdir)#;" \
                        -e "s#@@PGBINDIR@@#$(pgbindir)#;" \
+                       -e "s#@@SLONBINDIR@@#$(slonbindir)#;" \
                        -e "s#@@TOOLSBIN@@#$(toolsbin)#;" \
                        $$file > $$tmpname && \
 		chmod 755 $$tmpname \