[Fedora-directory-commits] dsgw/m4 httpd.m4,1.1.1.1,1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsgw/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22509/m4

Modified Files:
	httpd.m4 
Log Message:
cleaned up build and setup scripts


Index: httpd.m4
===================================================================
RCS file: /cvs/dirsec/dsgw/m4/httpd.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- httpd.m4	1 Jun 2006 19:43:50 -0000	1.1.1.1
+++ httpd.m4	2 Jun 2006 22:57:18 -0000	1.2
@@ -36,6 +36,7 @@
     manualuri="/manual"
     cgiuri="/clients/dsgw/bin/"
     cookiedir="$basedir/cookies"
+    httpdconf="$withval/admin-serv/config/admserv.conf"
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -55,25 +56,25 @@
     httpd_conf_rel=`$HTTPD -V | grep SERVER_CONFIG_FILE | cut -f2 -d=`
     httpd_conf_rel=`eval echo $httpd_conf_rel`
 
-    httpd_conf=${httpd_root}/${httpd_conf_rel}
+    httpdconf=${httpd_root}/${httpd_conf_rel}
 
-    htmlbasedir=`grep \^DocumentRoot $httpd_conf|awk '{print $2}'`
+    htmlbasedir=`grep \^DocumentRoot $httpdconf|awk '{print $2}'`
     htmlbasedir=`eval echo $htmlbasedir`
     # these directories are html based
     htmldir="$htmlbasedir/dsgw/html"
     pbhtmldir="$htmlbasedir/dsgw/pbhtml"
     configdir="$htmlbasedir/dsgw/config"
     pbconfigdir="$htmlbasedir/dsgw/pbconfig"
-    manualuri="/dirsvr/manual"
+    manualuri="/dsgw/manual"
 
     # CGI program directory
-    cgibindir=`grep '^ScriptAlias.*/cgi-bin/' $httpd_conf|awk '{print $3}'`
+    cgibindir=`grep '^ScriptAlias.*/cgi-bin/' $httpdconf|awk '{print $3}'`
     cgibindir=`eval echo $cgibindir`
-    cgiuri=`grep '^ScriptAlias.*/cgi-bin/' $httpd_conf|awk '{print $2}'`
+    cgiuri=`grep '^ScriptAlias.*/cgi-bin/' $httpdconf|awk '{print $2}'`
 
     # configuration files and etc.
-    contextdir=/etc/dsgw
+    contextdir=$sysconfdir/dsgw
     propertydir=$contextdir
     securitydir=$contextdir
-    cookiedir=/var/run/dsgw/cookies
+    cookiedir=$localstatedir/run/dsgw/cookies
 fi