Index: req-config
===================================================================
RCS file: /cvsroot/its/sw/wreq/req-config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- req-config	1999/05/10 08:49:43	1.2
+++ req-config	1999/05/15 10:20:04	1.3
@@ -8,10 +8,6 @@
 #### The default location is "*/cgi-bin/wreq/data":
 $top='../../data/wreq';
 
-#### Directory name where all the req* scripts live:
-#### No need to change if $top above has not been changed.
-$scriptdir='..';
-
 #### How to call sendmail on your system
 $sendmail="/usr/lib/sendmail -oi"; # will -db make the page faster to return?
 
Index: req-mail
===================================================================
RCS file: /cvsroot/its/sw/wreq/req-mail,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- req-mail	1999/05/10 08:49:43	1.2
+++ req-mail	1999/05/15 10:22:44	1.3
@@ -7,9 +7,13 @@
 
 ### load in the following global config params:
 ### $wreq_host $wreq_port $wreq_url $error_cc $error_from
-#require 'req-config';
-$rcf=$0; $rcf=~s/\-mail$/\-config/;
-require "$rcf";
+
+# Add 'pwd' to include path
+@F = split('/', $0); pop @F;
+push (@INC,join ('/', @F));
+
+require 'req-config';
+
 if(-f "$rcf-duke"){# hack to get our web server
 	$wreq_host='caesar';
 }
Index: req
===================================================================
RCS file: /cvsroot/its/sw/wreq/req,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- req	1999/05/10 08:49:43	1.2
+++ req	1999/05/15 10:19:27	1.3
@@ -110,7 +110,6 @@
 #	$rhost $raddr	browser's hostname and IP number
 # 	%DBM OUT IN LOCK	gdbm hash, output/input/lock filehandle
 #	$top	top dir of the req data
-#	$scriptdir	absolute dir name where all the req* scripts reside
 # 	
 # gmtime:
 # 	0sec(0-61) 1min(0-59) 2hour(0-23) 3mday(1-31) 4mon(0-11) 5year(+1900)
@@ -151,8 +150,11 @@
 #	Make all email address case insentive
 #
 ####################################################################
+# Add 'pwd' to include path
+@F = split('/', $0); pop @F;
+push (@INC,join ('/', @F));
 # load in global config params
-require "$0-config";
+require "req-config";
 ####################################################################
 $url="$ENV{'SCRIPT_NAME'}";
 $server="$ENV{'SERVER_NAME'}";# set in server's conf file
@@ -173,7 +175,6 @@
 	&html_error("Error, the req directory \"$top\" doesn't exist.");
 }
 chdir $top || &html_error("Error, can't cd to top.");
-push @INC,$scriptdir; # `pwd` doesn't work here, since perl is interpreted
 umask 022;
 
 $oldauth=$auth=$warn='';