Commit f9f35765 authored by Marc Slemko's avatar Marc Slemko
Browse files

- 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

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88692 13f79535-47bb-0310-9956-ffa450edef68
parent c27ecb0d

CHANGES

+4 −0
Original line number Diff line number Diff line 
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]

Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ install-support: 




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 \

acinclude.m4

+4 −11
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ 
  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 @@ AC_DEFUN(APACHE_LAYOUT,[ 
  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 @@ AC_ARG_ENABLE(layout, 
])



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)

config.layout

+1 −1
Original line number Diff line number Diff line
@@ -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