--- netdisco.orig	2010-07-04 01:51:44.000000000 +0100
+++ netdisco	2010-07-04 01:55:59.000000000 +0100
@@ -113,7 +113,7 @@
 &header if (grep(/^([aABdeEFgIikKmMOprRTu]|expire-nodes-subnet)$/,keys %args) and !$BatchMode);
 
 # Parse Config File - Check for -C, then in current dir, then in default dir.
-foreach my $c ($args{C},"$FindBin::Bin/netdisco.conf",'/usr/local/netdisco/netdisco.conf') {
+foreach my $c ($args{C},"$FindBin::Bin/netdisco.conf",'%%ETCDIR%%/netdisco.conf') {
     if (defined $c and -r $c){
         $configfile = $c;
         print "Using Config File : $configfile\n" if $DEBUG;
@@ -683,7 +683,7 @@
 
     my ($file_name,$want_time,$no_header) = @_;
 
-    my $file_path = homepath('datadir','data');
+    my $file_path = homepath('datadir','%%DBDIR%%/netdisco');
 
     my $extension = defined $CONFIG{logextension} ? $CONFIG{logextension} : 'log';
     
@@ -4471,7 +4471,7 @@
 
 sub admin_daemon_pid {
     my $pid = shift;
-    my $pid_file = homepath('daemon_pid', 'netdisco_daemon.pid');
+    my $pid_file = homepath('daemon_pid', '%%RUNDIR%%/netdisco_daemon.pid');
 
     if (defined $pid) {
         print "Writing pid:$pid to $pid_file\n" if $DEBUG;