From: Robert Luberda <robert@debian.org>
Date: Sun, 16 Mar 2003 17:40:44 +0100
Subject: 005 paths

Change paths to conform FHS and Debian Policy.
---
 man2html/README                            | 8 ++++----
 man2html/cgibase.c                         | 2 +-
 man2html/hman.sh                           | 2 +-
 man2html/man2html.1                        | 4 ++--
 man2html/man2html.c                        | 2 +-
 man2html/scripts/cgi-aux/man/man.aux       | 2 +-
 man2html/scripts/cgi-bin/man/man2html      | 6 +++---
 man2html/scripts/cgi-bin/man/mansearch     | 4 ++--
 man2html/scripts/cgi-bin/man/mansearchhelp | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/man2html/README b/man2html/README
index 4fba43f..369ea88 100644
--- a/man2html/README
+++ b/man2html/README
@@ -10,9 +10,9 @@ Call: man2html [-l | -H host.domain:port] [filename]
 The contents of FILENAME (or STDIN, in case FILENAME is "-" or absent)
 are converted from man-style nroff to html, and printed on STDOUT.
 
-With "-l" URLs of the form "lynxcgi:/home/httpd/cgi-bin/..." are generated.
+With "-l" URLs of the form "lynxcgi:/usr/lib/cgi-bin/..." are generated.
 With "-H host" we make URLs of the form "http://host/cgi-bin/...".
-The default is "http://localhost/cgi-bin/...".
+The default is "/cgi-bin/...".
 
 2. A collection of scripts
 
@@ -29,9 +29,9 @@ and install user interface stuff.
 2A. man stuff
 
 This first part (that can be done separately with "make install-man-scripts")
-puts various scripts under /home/httpd/cgi-bin and /home/httpd/cgi-aux
+puts various scripts under /usr/lib/cgi-bin and /usr/share/man2html
 in a subdirectory man.
-It will create a directory /var/man2html to hold the indices.
+It will create a directory /var/cache/man2html to hold the indices.
 (This directory should be writable by the cgi scripts;
 probably that means that the owner should be nobody.
 Choose a group and add all non-httpd users that should be
diff --git a/man2html/cgibase.c b/man2html/cgibase.c
index e39370a..38c42da 100644
--- a/man2html/cgibase.c
+++ b/man2html/cgibase.c
@@ -18,7 +18,7 @@ static int relat_html_style = 0;
 /*
  * Either the user is non-local (or local, but using httpd),
  * in which case we use http:/cgi-bin, or the user is local
- * and uses lynx, and we use lynxcgi:/home/httpd/cgi-bin.
+ * and uses lynx, and we use lynxcgi:/usr/lib/cgi-bin.
  */
 
 static char *man2htmlpath = "/cgi-bin/man/man2html"; 	/* default */
diff --git a/man2html/hman.sh b/man2html/hman.sh
index 915522a..12147ea 100755
--- a/man2html/hman.sh
+++ b/man2html/hman.sh
@@ -57,7 +57,7 @@ nsfunc () {
 case "$HMAN_BROWSER" in
      lynxcgi)
 	HMAN_BROWSER=lynx
-	CG="lynxcgi:/home/httpd/cgi-bin/man"
+	CG="lynxcgi:/usr/lib/cgi-bin/man"
 	;;
      netscape)
         HMAN_BROWSER=nsfunc
diff --git a/man2html/man2html.1 b/man2html/man2html.1
index 385e3a7..dea25f8 100644
--- a/man2html/man2html.1
+++ b/man2html/man2html.1
@@ -88,7 +88,7 @@ Set method:cgipath to
 .TP
 .B \-\^l
 Set method:cgipath to
-.RI lynxcgi: /home/httpd .
+.RI lynxcgi: /usr/lib .
 .TP
 .BI \-\^L " dir"
 Set method:cgipath to
@@ -115,7 +115,7 @@ to browse the man pages, using the lynxcgi method.
 When some http daemon is running, lynx, or any other browser,
 can be used to browse the man pages, using the http method.
 The option \-l (for `lynxcgi') selects the former behaviour.
-With it, the default cgipath is \fI/home/httpd\fP.
+With it, the default cgipath is \fI/usr/lib\fP.
 
 In general, a cgi script can be called by
 .IP
diff --git a/man2html/man2html.c b/man2html/man2html.c
index 1b4a24d..2c8a04c 100644
--- a/man2html/man2html.c
+++ b/man2html/man2html.c
@@ -3109,7 +3109,7 @@ main(int argc, char **argv) {
 	 case 'H':
 	      set_cgibase(optarg); break;
 	 case 'l':
-	      set_lynxcgibase("/home/httpd"); break;
+	      set_lynxcgibase("/usr/lib"); break;
 	 case 'L':
 	      set_lynxcgibase(optarg); break;
 	 case 'M':
diff --git a/man2html/scripts/cgi-aux/man/man.aux b/man2html/scripts/cgi-aux/man/man.aux
index e381b01..a1353b7 100644
--- a/man2html/scripts/cgi-aux/man/man.aux
+++ b/man2html/scripts/cgi-aux/man/man.aux
@@ -4,7 +4,7 @@ Content-type: text/html
 <HEAD>
 <TITLE>Manual Pages - Main Contents</TITLE>
 <!-- Note: this is not html, but requires preprocessing -->
-<!-- It is used by /home/httpd/cgi-bin/man/man2html -->
+<!-- It is used by /usr/lib/cgi-bin/man/man2html -->
 </HEAD>
 <BODY>
 <H1>Manual Pages - Main Contents</H1>
diff --git a/man2html/scripts/cgi-bin/man/man2html b/man2html/scripts/cgi-bin/man/man2html
index 7c515d1..44cbbb5 100755
--- a/man2html/scripts/cgi-bin/man/man2html
+++ b/man2html/scripts/cgi-bin/man/man2html
@@ -1,10 +1,10 @@
 #!/bin/sh
 # man2html cgi script - uses /usr/bin/man2html to format man pages
-# auxiliary text files in /home/httpd/cgi-aux/man
+# auxiliary text files in /usr/share/man2html
 # aeb@cwi.nl - 980109
 
 MAN2HTML="/usr/bin/man2html"
-MANX="/home/httpd/cgi-aux/man/man.aux"
+MANX="/usr/share/man2html/man.aux"
 
 # Do we need lynxcgi URLs? For the moment our criterion is
 # 1) HTTP_USER_AGENT=Lynx*  and 2) HTTP_HOST is unset.
@@ -25,7 +25,7 @@ SERVER="${SERVER_NAME-localhost}"
 case "$HH" in
     nohh)
 	LL="-l"
-	CG="lynxcgi:/home/httpd/cgi-bin/man"
+	CG="lynxcgi:/usr/lib/cgi-bin/man"
 	;;
     *)
 	LL="-H$SERVER"
diff --git a/man2html/scripts/cgi-bin/man/mansearch b/man2html/scripts/cgi-bin/man/mansearch
index 2644db6..5d9416e 100755
--- a/man2html/scripts/cgi-bin/man/mansearch
+++ b/man2html/scripts/cgi-bin/man/mansearch
@@ -23,7 +23,7 @@ esac
 SERVER="${SERVER_NAME-localhost}"
 case "$HH" in
     nohh)
-	CG="lynxcgi:/home/httpd/cgi-bin/man"
+	CG="lynxcgi:/usr/lib/cgi-bin/man"
 	;;
     *)
 	CG="http://$SERVER/cgi-bin/man"
@@ -56,7 +56,7 @@ function removeopts(string) {
 
 BEGIN {
 
-  searchdocument = "/home/httpd/cgi-aux/man/mansearch.aux";
+  searchdocument = "/usr/share/man2html/mansearch.aux";
   quote = ENVIRON["QUOTE"];
   cgipath = ENVIRON["CG"];
   sedcmd = ENVIRON["SED"];
diff --git a/man2html/scripts/cgi-bin/man/mansearchhelp b/man2html/scripts/cgi-bin/man/mansearchhelp
index a96e796..28b144c 100755
--- a/man2html/scripts/cgi-bin/man/mansearchhelp
+++ b/man2html/scripts/cgi-bin/man/mansearchhelp
@@ -1,6 +1,6 @@
 #!/bin/sh
 MAN2HTML=/usr/bin/man2html
-MANSH=/home/httpd/cgi-aux/man/mansearchhelp.aux
+MANSH=/usr/share/man2html/mansearchhelp.aux
 
 # Do we need lynxcgi URLs? For the moment our criterion is
 # 1) HTTP_USER_AGENT=Lynx*  and 2) HTTP_HOST is unset.
@@ -17,7 +17,7 @@ esac
 SERVER="${SERVER_NAME-localhost}"
 case "$HH" in
     nohh)
-	CG="lynxcgi:/home/httpd/cgi-bin/man"
+	CG="lynxcgi:/usr/lib/cgi-bin/man"
 	;;
     *)
 	CG="http://$SERVER/cgi-bin/man"
