httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject cvs commit: httpd-2.0 CHANGES Makefile.in acinclude.m4 config.layout
Date Tue, 03 Apr 2001 17:03:37 GMT
marc        01/04/03 10:03:37

  Modified:    .        CHANGES Makefile.in acinclude.m4 config.layout
  Log:
  - change inconsistent use of logdir and logfiledir all to logfiledir, to
    make the config.layout file work properly.
  - change default layout to be "Apache", as defined in config.layout,
    instead of duplicating (some of) that layout in configure itself.
  - change default installation path to /usr/local/apache2
  
  Revision  Changes    Path
  1.159     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.158
  retrieving revision 1.159
  diff -u -r1.158 -r1.159
  --- CHANGES	2001/04/03 01:43:13	1.158
  +++ CHANGES	2001/04/03 17:03:35	1.159
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0.16-dev
  +
  +  *) Change the default installation directory to /usr/local/apache2,
  +     as now defined by the "Apache" layout in config.layout. [Marc Slemko]
  +
     *) OS/2: Added support for building loadable modules as OS/2 DLLs. 
        [Brian Havard]
   
  
  
  
  1.64      +1 -1      httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Makefile.in	2001/04/02 19:05:59	1.63
  +++ Makefile.in	2001/04/03 17:03:35	1.64
  @@ -93,7 +93,7 @@
   
   
   install-other:
  -	@test -d $(logdir) || $(MKINSTALLDIRS) $(logdir)
  +	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
   	@for ext in dll x; do \
   		file=apachecore.$$ext; \
   		if test -f $$file; then \
  
  
  
  1.75      +4 -11     httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- acinclude.m4	2001/04/03 05:51:20	1.74
  +++ acinclude.m4	2001/04/03 17:03:35	1.75
  @@ -40,7 +40,7 @@
     APACHE_SUBST(bindir)
     APACHE_SUBST(sbindir)
     APACHE_SUBST(cgidir)
  -  APACHE_SUBST(logdir)
  +  APACHE_SUBST(logfiledir)
     APACHE_SUBST(exec_prefix)
     APACHE_SUBST(datadir)
     APACHE_SUBST(localstatedir)
  @@ -291,7 +291,7 @@
     rm $pldconf
     for var in prefix exec_prefix bindir sbindir libexecdir mandir \
                sysconfdir datadir iconsdir htdocsdir cgidir includedir \
  -             localstatedir runtimedir logdir proxycachedir; do
  +             localstatedir runtimedir logfiledir proxycachedir; do
       eval "val=\"\$$var\""
       case $val in
         *+)
  @@ -329,16 +329,9 @@
   ])
   
   if test -z "$LAYOUT"; then
  -  htdocsdir='$(prefix)/htdocs'
  -  iconsdir='$(prefix)/icons'
  -  cgidir='$(prefix)/cgi-bin'
  -  logdir='$(prefix)/logs'
  -  sysconfdir='${prefix}/conf'
  -  libexecdir='${prefix}/modules'
  -  layout_name=Apache
  -else  
  -  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
  +  LAYOUT="Apache"
   fi
  +APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)
   
   AC_MSG_CHECKING(for chosen layout)
   AC_MSG_RESULT($layout_name)
  
  
  
  1.3       +1 -1      httpd-2.0/config.layout
  
  Index: config.layout
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/config.layout,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- config.layout	2000/12/22 11:58:55	1.2
  +++ config.layout	2001/04/03 17:03:35	1.3
  @@ -11,7 +11,7 @@
   
   #   Classical Apache path layout.
   <Layout Apache>
  -    prefix:        /usr/local/apache
  +    prefix:        /usr/local/apache2
       exec_prefix:   $prefix
       bindir:        $exec_prefix/bin
       sbindir:       $exec_prefix/bin
  
  
  

Mime
View raw message