--- ./ddclient.orig	Sun Dec 18 18:03:42 2005
+++ ./ddclient	Tue May  2 18:38:16 2006
@@ -21,8 +20,8 @@
 $program  =~ s/d$//;
 my $now       = time;
 my $hostname  = hostname();
-my $etc       = ($program =~ /test/i) ? './'   : '/etc/ddclient/';
-my $savedir   = ($program =~ /test/i) ? 'URL/' : '/tmp/';
+my $etc       = '%%PREFIX%%/etc/';
+my $savedir   = (exists($ENV{TMPDIR}) ? "$ENV{TMPDIR}/" : "/var/tmp/");
 my $msgs      = '';
 my $last_msgs = '';
 
@@ -30,7 +29,7 @@
 local $file   = '';
 local $lineno = '';
 
-$ENV{'PATH'} = (exists($ENV{PATH}) ? "$ENV{PATH}:" : "") . "/sbin:/usr/sbin:/bin:/usr/bin:/etc:/usr/lib:";
+$ENV{'PATH'} = (exists($ENV{PATH}) ? "$ENV{PATH}:" : "") . "/sbin:/usr/sbin:/bin:/usr/bin:";
 
 sub T_ANY	{'any'};
 sub T_STRING	{'string'};