marc 98/03/11 11:11:10
Modified: src/include httpd.h
Log:
Use HTTPD_ROOT instead of /usr/local/apache; the intent is obviously to
default to having them all below HTTPD_ROOT, so we may as well just do that.
PR: 1894
Submitted by: Jason Riedy <[EMAIL PROTECTED]>, Marc Slemko
Revision Changes Path
1.196 +7 -5 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- httpd.h 1998/03/09 22:42:56 1.195
+++ httpd.h 1998/03/11 19:11:09 1.196
@@ -67,7 +67,7 @@
/* ----------------------------- config dir ------------------------------ */
-/* Define this to be the default server home dir. Anything later in this
+/* Define this to be the default server home dir. Most things later in this
* file with a relative pathname will have this added.
*/
#ifndef HTTPD_ROOT
@@ -82,13 +82,15 @@
#endif
#endif /* HTTPD_ROOT */
-/* Root of server */
+/* Default location of documents. Can be overridden by the DocumentRoot
+ * directive.
+ */
#ifndef DOCUMENT_LOCATION
#ifdef __EMX__
/* Set default for OS/2 file system */
-#define DOCUMENT_LOCATION "/os2httpd/docs"
+#define DOCUMENT_LOCATION HTTPD_ROOT "/docs"
#else
-#define DOCUMENT_LOCATION "/usr/local/apache/htdocs"
+#define DOCUMENT_LOCATION HTTPD_ROOT "/htdocs"
#endif
#endif /* DOCUMENT_LOCATION */
@@ -233,7 +235,7 @@
/* The path to the suExec wrapper, can be overridden in Configuration */
#ifndef SUEXEC_BIN
-#define SUEXEC_BIN "/usr/local/apache/sbin/suexec"
+#define SUEXEC_BIN HTTPD_ROOT "/sbin/suexec"
#endif
/* The default string lengths */
