CVS User Account cvsuser
Fri Oct 27 10:10:27 PDT 2006
Log Message:
-----------
Replace absolute paths with @@ locations in altperl scripts - per bug
report from Peter Eisentraut - #1595

Tags:
----
REL_1_2_STABLE

Modified Files:
--------------
    slony1-engine/tools/altperl:
        slonik_drop_table.pl (r1.1 -> r1.1.2.1)
        slonik_print_preamble.pl (r1.1 -> r1.1.2.1)

-------------- next part --------------
Index: slonik_print_preamble.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slonik_print_preamble.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -Ltools/altperl/slonik_print_preamble.pl -Ltools/altperl/slonik_print_preamble.pl -u -w -r1.1 -r1.1.2.1
--- tools/altperl/slonik_print_preamble.pl
+++ tools/altperl/slonik_print_preamble.pl
@@ -7,7 +7,7 @@
 
 use Getopt::Long;
 
-$CONFIG_FILE = '/usr/local/etc/slon_tools.conf';
+$CONFIG_FILE = '@@SYSCONFDIR@@/slon_tools.conf';
 $SHOW_USAGE  = 0;
 
 # Read command-line options
@@ -29,7 +29,7 @@
     exit 0;
 }
 
-require '/usr/local/pgsql/lib//slon-tools.pm';
+require '@@PGLIBDIR@@/slon-tools.pm';
 require $CONFIG_FILE;
 
 $FILE="/tmp/print_preamble.$$";
Index: slonik_drop_table.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slonik_drop_table.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -Ltools/altperl/slonik_drop_table.pl -Ltools/altperl/slonik_drop_table.pl -u -w -r1.1 -r1.1.2.1
--- tools/altperl/slonik_drop_table.pl
+++ tools/altperl/slonik_drop_table.pl
@@ -7,7 +7,7 @@
 
 use Getopt::Long;
 
-$CONFIG_FILE = '/usr/local/etc/slon_tools.conf';
+$CONFIG_FILE = '@@SYSCONFDIR@@/slon_tools.conf';
 $SHOW_USAGE  = 0;
 
 # Read command-line options
@@ -31,7 +31,7 @@
     exit 0;
 }
 
-require '/usr/local/pgsql/lib//slon-tools.pm';
+require '@@PGLIBDIR@@/slon-tools.pm';
 require $CONFIG_FILE;
 
 my ($TABLE_ID,$set) = @ARGV;



More information about the Slony1-commit mailing list