Mailing List Archive

rse 98/04/21 01:05:01

Modified: . STATUS Makefile.tmpl
src CHANGES
Log:
Fix path of MimeMagicFile in install-config, too.

Submitted by: Ralf S. Engelschall
PR: 2089

Revision Changes Path
1.314 +2 -1 apache-1.3/STATUS

Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- STATUS 1998/04/21 00:10:45 1.313
+++ STATUS 1998/04/21 08:04:58 1.314
@@ -45,7 +45,6 @@

Committed Code Changes:

- * HP-UX 11 port by Jeff Earickson
* Lars' Configure fix to avoid confusing message under APACI control
* Ralf's Configure fix for AWK's failing with "string to long" error
* Ralf's fix for stderr logging to make sure default loglevel is honored
@@ -54,6 +53,8 @@
* Lars' fix for the prefix setup on configure --compat
* Dean's add %pA, %pI, and %pp codes to ap_vformatter
* Dean's httpd -S command line option to dump parsed vhost setup
+ * HP-UX 11 port by Jeff Earickson
+ * Ralf's fix for the install-config target to get correct MimeMagicFile

Available Patches:




1.21 +1 -0 apache-1.3/Makefile.tmpl

Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.tmpl 1998/04/20 06:40:00 1.20
+++ Makefile.tmpl 1998/04/21 08:04:58 1.21
@@ -346,6 +346,7 @@
-e 's;logs/httpd.pid;$(localstatedir)/$(localstatesubdir_run)/httpd.pid;' \
-e 's;logs/access_log;$(localstatedir)/$(localstatesubdir_logs)/access_log;' \
-e 's;logs/error_log;$(localstatedir)/$(localstatesubdir_logs)/error_log;' \
+ -e 's;conf/magic;$(sysconfdir)/magic;' \
>.install.tmp && \
echo "$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default"; \
$(INSTALL_DATA) .install.tmp $(sysconfdir)/$$conf.default; \



1.779 +3 -0 apache-1.3/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -r1.778 -r1.779
--- CHANGES 1998/04/20 23:51:14 1.778
+++ CHANGES 1998/04/21 08:04:59 1.779
@@ -1,5 +1,8 @@
Changes with Apache 1.3b7

+ *) Fix the path to the MimeMagicFile in the install-config target, too.
+ [Ralf S. Engelschall, PR#2089]
+
*) PORT: Added HP-UX 11 patches [Jeff Earickson <jaearick@colby.edu>]

*) If you start apache with the -S command line option it will dump