httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3 Makefile.tmpl
Date Thu, 25 Mar 1999 19:57:00 GMT
rse         99/03/25 11:56:59

  Modified:    src      CHANGES
               .        Makefile.tmpl
  Log:
  Fix sed-substitutions in `make install': path elements like `httpd/conf' (for
  instance from an APACI configure --sysconfdir=/etc/httpd/conf option) were
  substituted with $(TARGET).conf, etc. Same for other strings with dots where
  the dot wasn't matched as plain text.
  
  Discovered by mod_ssl user Magnus Stenman <stone@hkust.se>.
  
  Revision  Changes    Path
  1.1294    +6 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1293
  retrieving revision 1.1294
  diff -u -r1.1293 -r1.1294
  --- CHANGES	1999/03/24 09:23:53	1.1293
  +++ CHANGES	1999/03/25 19:56:44	1.1294
  @@ -1,5 +1,11 @@
   Changes with Apache 1.3.7
   
  +  *) Fix sed-substitutions in `make install': path elements like `httpd/conf'
  +     (for instance from an APACI configure --sysconfdir=/etc/httpd/conf
  +     option) were substituted with $(TARGET).conf, etc. Same for other strings
  +     with dots where the dot wasn't matched as plain text. 
  +     [Ralf S. Engelschall]
  +
     *) PORT: Add support for FreeBSD 4.x [Ralf S. Engelschall]
   
     *) Fix verbose output of APACI configure (option -v) 
  
  
  
  1.68      +4 -4      apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- Makefile.tmpl	1999/03/16 00:38:46	1.67
  +++ Makefile.tmpl	1999/03/25 19:56:56	1.68
  @@ -432,16 +432,16 @@
   			-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
   			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
   			-e 's;@@ServerRoot@@;$(prefix);g' \
  -			-e 's;httpd.conf;$(TARGET).conf;' \
  -			-e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \
  +			-e 's;httpd\.conf;$(TARGET).conf;' \
  +			-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
   			-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
  -			-e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \
  +			-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
   			-e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \
   			-e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \
   			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
   			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
   			-e 's;conf/magic;$(sysconfdir)/magic;' \
  -			-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
  +			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
   			-e 's;Group #-1;Group $(conf_group);' \
   			-e 's;Port 80;Port $(conf_port);' \
   			-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
  
  
  

Mime
View raw message