httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Wilfredo Sanchez <wsanc...@apple.com>
Subject [PATCH] (Take II) Makefile and Configure
Date Fri, 26 Jun 1998 04:05:34 GMT
  The following are Makefile/configure changes to Apache 1.3.0. These patches address the following
issues.  I did this stuff in order to be able to build under Rhapsody in the way that I need
in  
order to be able to submit Apache 1.3 for a system release, but these patches are not Rhapsody
specific and should be useful for all platforms.

 - Can't build outside of the source tree. It's useful to be able
   to build when your sources are on a filesystem that are mounted
   read-only. This turned out to be a very straightforward fix,
   since the --shadow functionality covers most of the problem.
   I added --shaodw=<build_dir to let the use specify the build
   root. Most fixes involved using $(TOP) slightly differently.

 - Added more customizeability for installation layout. You can
   now specify where your document root, cgi directory, etc. belong.
   This is important for me to be able to put the user-visible parts
   of Apache outside of the BSD filesystem on Rhapsody. Added
   --pretty option to use configuration file names that aren't
   obtuse UNIX-style names. Added --httpd=<httpd> so apache doesn't
   have to be called httpd, which may conflict with another server.

   This stuff will be even more important for Mac OS X, where the BSD
   filesystem may not even be there (it's optional). For example, we
   may end up putting all of apache in a Yellow Box app wrapper, with
   a UI-based admin app. Or maybe we'll even use HFS Plus semantics
   some. I dunno, but we'll need to be flexible, since the constraints
   aren't clear yet.

 - Fixed build-time editing of supporting programs and configuration
   files to reflect the above.

  I tested these by building with "./configure", "./configure --shadow", and "./configure
--shadow=/tmp/apache/build". I didn't get a change to build old-style, but configure uses
Configure, and I  
didn't need to whack Configure to make this work. Someone who uses old-style builds regularly
should make sure I didn't break it.

	-Fred
	 Apple Computer, Core Operating Systems Group
	 wsanchez@apple.com, 408.974-5174
	 2 Infinite Loop 302-4K, Cupertino, CA 95014


Index: CoreOS/Services/apache/apache/INSTALL
diff -u CoreOS/Services/apache/apache/INSTALL:1.1.1.1 CoreOS/Services/apache/apache/INSTALL:1.2
--- CoreOS/Services/apache/apache/INSTALL:1.1.1.1	Tue Jun 16 08:35:19 1998
+++ CoreOS/Services/apache/apache/INSTALL	Sun Jun 21 22:42:36 1998
@@ -137,25 +137,27 @@
        [INCLUDES=...]  [LDFLAGS_SHLIB_EXPORT=...]
        [LDFLAGS=...]   [RANLIB=...]
        [LIBS=...]
-       ./configure [--quiet]   [--prefix=DIR]         [--enable-rule=NAME]
-                   [--verbose] [--exec-prefix=PREFIX] [--disable-rule=NAME]
-                   [--shadow]  [--bindir=EPREFIX]     [--add-module=FILE]
-                   [--help]    [--sbindir=DIR]        [--activate-module=FILE]
-                   [--layout]  [--libexecdir=DIR]     [--enable-module=NAME]
-                               [--mandir=DIR]         [--disable-module=NAME]
-                               [--sysconfdir=DIR]     [--enable-shared=NAME]
-                               [--datadir=DIR]        [--disable-shared=NAME]
-                               [--includedir=DIR]
-                               [--localstatedir=DIR]  [--enable-suexec]
-                               [--runtimedir=DIR]     [--suexec-caller=UID]
-                               [--logfiledir=DIR]     [--suexec-userdir=DIR]
-                               [--proxycachedir=DIR]  [--suexec-uidmin=UID]
-                               [--compat]             [--suexec-gidmin=GID]
-                                                      [--suexec-safepath=PATH]
+       ./configure [--quiet]         [--prefix=DIR]         [--enable-rule=NAME]
+                   [--verbose]       [--exec-prefix=PREFIX] [--disable-rule=NAME]
+                   [--shadow[=DIR]]  [--bindir=EPREFIX]     [--add-module=FILE]
+                   [--help]          [--sbindir=DIR]        [--activate-module=FILE]
+                   [--layout]        [--libexecdir=DIR]     [--enable-module=NAME]
+                                     [--mandir=DIR]         [--disable-module=NAME]
+                                     [--sysconfdir=DIR]     [--enable-shared=NAME]
+                                     [--datadir=DIR]        [--disable-shared=NAME]
+                                     [--includedir=DIR]
+                                     [--localstatedir=DIR]  [--enable-suexec]
+                                     [--runtimedir=DIR]     [--suexec-caller=UID]
+                                     [--logfiledir=DIR]     [--suexec-userdir=DIR]
+                                     [--proxycachedir=DIR]  [--suexec-uidmin=UID]
+                                     [--documentroot=DIR]   [--suexec-gidmin=GID]
+                                     [--cgidir=DIR]         [--suexec-safepath=PATH]
+				     [--iconsdir=DIR]
+                                     [--userdir=DIR]        [--with-perl=FILE]
+                                     [--httpd=NAME]         [--without-support]
+				     [--compat]
+				     [--pretty]

-                                                      [--with-perl=FILE]
-                                                      [--without-support]
-
      Use the CC, OPTIM, CFLAGS, INCLUDES, LDFLAGS, LIBS, CFLAGS_SHLIB,
      LD_SHLIB, LDFLAGS_SHLIB, LDFLAGS_SHLIB_EXPORT and RANLIB environment
      variables to override the corresponding default entries in the
@@ -183,13 +185,16 @@

      Use the --bindir=DIR, --sbindir=DIR, --libexecdir=DIR, --mandir=DIR,
      --sysconfdir=DIR, --datadir=DIR, --includedir=DIR, --localstatedir=DIR,
-     --runtimedir=DIR, --logfiledir=DIR and proxycachedir=DIR option to change
-     the paths for particular subdirectories of the installation tree.
+     --runtimedir=DIR, --logfiledir=DIR, --proxycachedir=DIR, --documentroot=DIR
+     --cgidir=DIR, and --iconsdir=DIR, options to change the paths for particular
+     subdirectories of the installation tree.
      Defaults are bindir=EPREFIX/bin, sbindir=EPREFIX/sbin,
      libexecdir=EPREFIX/libexec, mandir=PREFIX/man, sysconfdir=PREFIX/etc,
      datadir=PREFIX/share, includedir=PREFIX/include,
      localstatedir=PREFIX/var, runtimedir=PREFIX/var/run,
-     logfiledir=PREFIX/var/log and proxycachedir=PREFIX/var/proxy.
+     logfiledir=PREFIX/var/log, proxycachedir=PREFIX/var/proxy.
+     documentroot=DATADIR/htdocs, cgidir=DATADIR/cgi-bin, and
+     iconsdir=DATADIR/icons.

      Use the --compat option to install Apache into a installation tree which
      has a similar layout than the one used with Apache 1.2.
@@ -197,6 +202,19 @@
      Use the --layout option to check the final installation path layout while
      fiddling with the options above.

+     Use the --userdir option to set the directory in a user's home directory
+     that is used for "~user" expansion. Default is public_html.
+
+     Use the --httpd option to change the name of the httpd executable from the
+     default of "httpd".
+
+     Use the --pretty option to change the names of the configuration files
+     from the traditional names (httpd.conf, srm.conf, access.conf, mime.types,
+     and magic) to more readable names (Server, Resources, Access, MIME, and
+     Magic). This also changes the default names for log files from access_log,
+     error_log, referer_log, agent_log, and httpd.pid to Access, Error, Referers,
+     Agents, and ProcessID.
+
      Use the --enable-rule=NAME and --disable-rule=NAME options to enable or
      disable a particular Rule from the Apache src/Configuration.tmpl file. The
      defaults (yes=enabled, no=disabled) can either be seen when running
Index: CoreOS/Services/apache/apache/Makefile.tmpl
diff -u CoreOS/Services/apache/apache/Makefile.tmpl:1.1.1.1 CoreOS/Services/apache/apache/Makefile.tmpl:1.7
--- CoreOS/Services/apache/apache/Makefile.tmpl:1.1.1.1	Tue Jun 16 08:35:22 1998
+++ CoreOS/Services/apache/apache/Makefile.tmpl	Thu Jun 25 19:53:21 1998
@@ -81,8 +81,8 @@
 RM              = rm -f
 TAR             = tar
 UMASK           = umask
-MKDIR           = $(TOP)/$(AUX)/mkdir.sh
-INSTALL         = $(TOP)/$(AUX)/install.sh -c
+MKDIR           = $(AUX)/mkdir.sh
+INSTALL         = $(AUX)/install.sh -c
 INSTALL_PROGRAM = $(INSTALL) -s -m 755
 INSTALL_SCRIPT  = $(INSTALL) -m 755
 INSTALL_DATA    = $(INSTALL) -m 644
@@ -107,6 +107,11 @@
 runtimedir      = @runtimedir@
 logfiledir      = @logfiledir@
 proxycachedir   = @proxycachedir@
+documentroot    = @documentroot@
+cgidir          = @cgidir@
+iconsdir        = @iconsdir@
+userdir         = @userdir@
+httpd           = @httpd@

 libexecdir_relative   = @libexecdir_relative@

@@ -118,6 +123,20 @@
 suexec_gidmin   = @suexec_gidmin@
 suexec_safepath = @suexec_safepath@

+# File names
+default_pidlog       = @default_pidlog@
+default_scoreboard   = @default_scoreboard@
+default_lockfile     = @default_lockfile@
+default_xferlog      = @default_xferlog@
+default_errorlog     = @default_errorlog@
+default_refererlog   = @default_refererlog@
+default_agentlog     = @default_agentlog@
+types_config_file    = @types_config_file@
+magic_config_file    = @magic_config_file@
+server_config_file   = @server_config_file@
+access_config_file   = @access_config_file@
+resource_config_file = @resource_config_file@
+
 #   usage of src/support stuff
 build-support     = @build_support@
 install-support   = @install_support@
@@ -142,17 +161,17 @@
 build:
 	@echo "===> $(SRC)"
 	@$(MAKE) -f $(MKF) $(MFLAGS) $(MFWD) build-std $(build-support)
-	@touch $(TOP)/$(SRC)/.apaci.build.ok
+	@touch $(SRC)/.apaci.build.ok
 	@echo "<=== $(SRC)"

 #   build the standard stuff
 build-std:
-	@cd $(TOP)/$(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ all
+	@cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ all

 #   build the additional support stuff
 build-support:
 	@echo "===> $(SRC)/support"; \
-	cd $(TOP)/$(SRC)/support; $(MAKE) $(MFLAGS) all; \
+	cd $(SRC)/support; $(MAKE) $(MFLAGS) all; \
 	if [ ".$(suexec)" = .1 ]; then \
 	    $(MAKE) $(MFLAGS) \
 		EXTRA_CFLAGS='\
@@ -161,7 +180,7 @@
 			-DGID_MIN=$(suexec_gidmin) \
 			-DUSERDIR_SUFFIX=\"$(suexec_userdir)\" \
 			-DLOG_EXEC=\"$(logfiledir)/suexec_log\" \
-			-DDOC_ROOT=\"$(datadir)/htdocs\" \
+			-DDOC_ROOT=\"$(documentroot)\" \
 			-DSAFE_PATH=\"$(suexec_safepath)\" \
 		' \
 		suexec; \
@@ -176,7 +195,7 @@
 #   package. This is implemented by running subtargets for the
 #   separate parts of the installation process.
 install:
-	@if [ ! -f $(TOP)/$(SRC)/.apaci.build.ok ]; then \
+	@if [ ! -f $(SRC)/.apaci.build.ok ]; then \
 	    $(MAKE) -f $(MKF) $(MFLAGS) $(MFWD) build; \
 	fi
 	@$(MAKE) -f $(MKF) $(MFLAGS) $(MFWD) \
@@ -191,7 +210,9 @@
 		echo "| works correctly you now should first check the         |"; \
 		echo "| (initially created or preserved) configuration files   |"; \
 		echo "|                                                        |"; \
-		echo "|   $(sysconfdir)/{httpd,access,srm}.conf"; \
+		echo "|   $(sysconfdir)/$(server_config_file)"; \
+		echo "|   $(sysconfdir)/$(access_config_file)"; \
+		echo "|   $(sysconfdir)/$(resource_config_file)"; \
 		echo "|                                                        |"; \
 		echo "| and then you should be able to immediately fire up     |"; \
 		echo "| Apache the first time by running:                      |"; \
@@ -216,9 +237,9 @@
 	$(MKDIR) $(root)$(mandir)/man1
 	$(MKDIR) $(root)$(mandir)/man8
 	$(MKDIR) $(root)$(sysconfdir)
-	$(MKDIR) $(root)$(datadir)/htdocs
-	$(MKDIR) $(root)$(datadir)/icons
-	$(MKDIR) $(root)$(datadir)/cgi-bin
+	$(MKDIR) $(root)$(documentroot)
+	$(MKDIR) $(root)$(iconsdir)
+	$(MKDIR) $(root)$(cgidir)
 	$(MKDIR) $(root)$(includedir)
 	$(MKDIR) $(root)$(runtimedir)
 	$(MKDIR) $(root)$(logfiledir)
@@ -229,13 +250,13 @@
 #   shared object files.
 install-programs:
 	@echo "===> [programs: Installing Apache httpd program and shared objects]"
-	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/httpd $(root)$(sbindir)/httpd
-	-@if [ ".`grep 'SUBTARGET=target_shared' $(TOP)/$(SRC)/Makefile`" != . ]; then \
-		echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/libhttpd.ep $(root)$(libexecdir)/libhttpd.ep"; \
-		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/libhttpd.ep $(root)$(libexecdir)/libhttpd.ep; \
-		echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/libhttpd.so $(root)$(libexecdir)/libhttpd.so"; \
-		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/libhttpd.so $(root)$(libexecdir)/libhttpd.so; \
-		SHLIB_SUFFIX_LIST="`grep '^SHLIB_SUFFIX_LIST=' $(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`";
\
+	$(INSTALL_PROGRAM) $(SRC)/httpd $(root)$(sbindir)/$(httpd)
+	-@if [ ".`grep 'SUBTARGET=target_shared' $(SRC)/Makefile`" != . ]; then \
+		echo "$(INSTALL_PROGRAM) $(SRC)/libhttpd.ep $(root)$(libexecdir)/libhttpd.ep"; \
+		$(INSTALL_SCRIPT) $(SRC)/libhttpd.ep $(root)$(libexecdir)/libhttpd.ep; \
+		echo "$(INSTALL_SCRIPT) $(SRC)/libhttpd.so $(root)$(libexecdir)/libhttpd.so"; \
+		$(INSTALL_SCRIPT) $(SRC)/libhttpd.so $(root)$(libexecdir)/libhttpd.so; \
+		SHLIB_SUFFIX_LIST="`grep '^SHLIB_SUFFIX_LIST=' $(SRC)/Makefile | sed -e 's:^.*=::'`"; \
 		if [ ".$${SHLIB_SUFFIX_LIST}" != . ]; then \
 			echo "$(RM) $(libexecdir)/libhttpd.so.*"; \
 			$(RM) $(libexecdir)/libhttpd.so.*; \
@@ -246,15 +267,15 @@
 			done; \
 		fi; \
 	fi
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/httpd.8 $(root)$(mandir)/man8/httpd.8
+	$(INSTALL_DATA) $(SRC)/support/httpd.8 $(root)$(mandir)/man8/$(httpd).8
 	-@$(RM) $(SRC)/.apaci.install.conf; touch $(SRC)/.apaci.install.conf
-	-@if [ ".`grep '^[ 	]*SharedModule' $(TOP)/$(SRC)/Configuration.apaci`" != . ]; then \
-		for mod in `egrep '^[ 	]*SharedModule' $(TOP)/$(SRC)/Configuration.apaci |\
+	-@if [ ".`grep '^[ 	]*SharedModule' $(SRC)/Configuration.apaci`" != . ]; then \
+		for mod in `egrep '^[ 	]*SharedModule' $(SRC)/Configuration.apaci |\
 	                sed -e 's/^[ 	]*SharedModule[ 	]*//'`; do \
 			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
-			echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
-			$(INSTALL_SCRIPT) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
-			name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
+			echo "$(INSTALL_SCRIPT) $(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
+			$(INSTALL_SCRIPT) $(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
+			name=`$(AUX)/fmn.sh $(SRC)/$${mod}`; \
 			echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
 			modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf;
\
 		done; \
@@ -274,85 +295,88 @@
 #   install the support programs and scripts
 install-support:
 	@echo "===> [support: Installing Apache support programs and scripts]"
-	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/ab $(root)$(sbindir)/ab
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/ab.1 $(root)$(mandir)/man1/ab.1
-	@echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/apachectl";
\
-	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/httpd.pid;' \
-		-e 's;HTTPD=.*;HTTPD=$(sbindir)/httpd;' \
-		< $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
-		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/apachectl.1
-	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htpasswd $(root)$(bindir)/htpasswd
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/htpasswd.1 $(root)$(mandir)/man1/htpasswd.1
-	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htdigest $(root)$(bindir)/htdigest
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/htdigest.1 $(root)$(mandir)/man1/htdigest.1
-	@echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/dbmmanage[*] $(root)$(bindir)/dbmmanage";
\
+	$(INSTALL_PROGRAM) $(SRC)/support/ab $(root)$(sbindir)/ab
+	$(INSTALL_DATA) $(SRC)/support/ab.1 $(root)$(mandir)/man8/ab.1
+	@echo "$(INSTALL_SCRIPT) $(SRC)/support/apachectl[*] $(root)$(sbindir)/apachectl"; \
+	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(default_pidlog);' \
+		-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(httpd);' \
+		< $(SRC)/support/apachectl > $(SRC)/.apaci.install.tmp && \
+		$(INSTALL_SCRIPT) $(SRC)/.apaci.install.tmp $(root)$(sbindir)/apachectl
+	$(INSTALL_DATA) $(SRC)/support/apachectl.1 $(root)$(mandir)/man8/apachectl.1
+	$(INSTALL_PROGRAM) $(SRC)/support/htpasswd $(root)$(bindir)/htpasswd
+	$(INSTALL_DATA) $(SRC)/support/htpasswd.1 $(root)$(mandir)/man1/htpasswd.1
+	$(INSTALL_PROGRAM) $(SRC)/support/htdigest $(root)$(bindir)/htdigest
+	$(INSTALL_DATA) $(SRC)/support/htdigest.1 $(root)$(mandir)/man1/htdigest.1
+	@echo "$(INSTALL_SCRIPT) $(SRC)/support/dbmmanage[*] $(root)$(bindir)/dbmmanage"; \
 	sed -e 's;^#!/.*;#!$(PERL);' \
-		< $(TOP)/$(SRC)/support/dbmmanage > $(TOP)/$(SRC)/.apaci.install.tmp && \
-		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(bindir)/dbmmanage
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/dbmmanage.1 $(root)$(mandir)/man1/dbmmanage.1
-	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/logresolve $(root)$(sbindir)/logresolve
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/logresolve.8 $(root)$(mandir)/man8/logresolve.8
-	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/rotatelogs $(root)$(sbindir)/rotatelogs
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/rotatelogs.8 $(root)$(mandir)/man8/rotatelogs.8
-	@echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apxs[*] $(root)$(sbindir)/apxs"; \
+		< $(SRC)/support/dbmmanage > $(SRC)/.apaci.install.tmp && \
+		$(INSTALL_SCRIPT) $(SRC)/.apaci.install.tmp $(root)$(bindir)/dbmmanage
+	$(INSTALL_DATA) $(SRC)/support/dbmmanage.1 $(root)$(mandir)/man1/dbmmanage.1
+	$(INSTALL_PROGRAM) $(SRC)/support/logresolve $(root)$(sbindir)/logresolve
+	$(INSTALL_DATA) $(SRC)/support/logresolve.8 $(root)$(mandir)/man8/logresolve.8
+	$(INSTALL_PROGRAM) $(SRC)/support/rotatelogs $(root)$(sbindir)/rotatelogs
+	$(INSTALL_DATA) $(SRC)/support/rotatelogs.8 $(root)$(mandir)/man8/rotatelogs.8
+	@echo "$(INSTALL_SCRIPT) $(SRC)/support/apxs[*] $(root)$(sbindir)/apxs"; \
 	sed -e 's;^#!/.*;#!$(PERL);' \
 		-e 's;\@prefix\@;$(prefix);' \
 		-e 's;\@sbindir\@;$(sbindir);' \
 		-e 's;\@libexecdir\@;$(libexecdir);' \
 		-e 's;\@includedir\@;$(includedir);' \
 		-e 's;\@sysconfdir\@;$(sysconfdir);' \
-		< $(TOP)/$(SRC)/support/apxs > $(TOP)/$(SRC)/.apaci.install.tmp && \
-		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/apxs
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/apxs.8 $(root)$(mandir)/man8/apxs.8
+		-e 's;\@httpd\@;$(httpd);' \
+		< $(SRC)/support/apxs > $(SRC)/.apaci.install.tmp && \
+		$(INSTALL_SCRIPT) $(SRC)/.apaci.install.tmp $(root)$(sbindir)/apxs
+	$(INSTALL_DATA) $(SRC)/support/apxs.8 $(root)$(mandir)/man8/apxs.8
 	-@if [ ".$(suexec)" = .1 ]; then \
-	    echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
-	    $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
+	    echo "$(INSTALL_PROGRAM) $(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
+	    $(INSTALL_PROGRAM) $(SRC)/support/suexec $(root)$(sbindir)/suexec; \
 	    echo "chown root $(sbindir)/suexec"; \
 	    chown root $(sbindir)/suexec; \
 	    echo "chmod 4711 $(sbindir)/suexec"; \
 	    chmod 4711 $(sbindir)/suexec; \
-	    echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8";
\
-	    $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
+	    echo "$(INSTALL_DATA) $(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
+	    $(INSTALL_DATA) $(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
 	fi
 	@echo "<=== [support]"

 #   install the Apache C header files
 install-include:
 	@echo "===> [include: Installing Apache C header files]"
-	$(UMASK) 022; $(CP) $(TOP)/$(SRC)/include/*.h $(root)$(includedir)/
-	@osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=.*/os:os:'`; \
-	echo "$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(includedir)/"; \
-	$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
+	$(UMASK) 022; $(CP) $(SRC)/include/*.h $(root)$(includedir)/
+	@osdir=`grep '^OSDIR=' $(SRC)/Makefile.config | sed -e 's:^OSDIR=.*/os:os:'`; \
+	echo "$(UMASK) 022; $(CP) $(SRC)/$${osdir}/os.h $(includedir)/"; \
+	$(UMASK) 022; $(CP) $(SRC)/$${osdir}/os.h $(root)$(includedir)/
 	@echo "<=== [include]"

 #   create an initial document root containing the Apache manual,
 #   icons and distributed CGI scripts.
 install-data:
 	@echo "===> [data: Installing initial data files]"
-	-@if [ -f $(root)$(datadir)/htdocs/index.html ]; then \
-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/htdocs/]"; \
+	-@if [ -f $(root)$(documentroot)/index.html ]; then \
+		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(documentroot)/]"; \
 	else \
-		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(datadir)/htdocs/"; \
+		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(documentroot)/"; \
 		(cd $(TOP)/htdocs/ && $(TAR) cf - *) |\
-		(cd $(root)$(datadir)/htdocs/ && $(TAR) xf -); \
-		find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ; \
-		find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
+		(cd $(root)$(documentroot)/ && $(TAR) xf -); \
+		find $(root)$(documentroot)/ -type d -exec chmod a+rx {} \; ; \
+		find $(root)$(documentroot)/ -type f -exec chmod a+r {} \; ; \
+		find $(root)$(documentroot)/ -type f -exec chmod a-x {} \; ; \
 	fi
-	-@if [ -f $(root)$(datadir)/cgi-bin/printenv ]; then \
-		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(datadir)/cgi-bin/]"; \
+	-@if [ -f $(root)$(cgidir)/printenv ]; then \
+		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
 	else \
-		echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(datadir)/cgi-bin/"; \
+		echo "Copying tree $(TOP)/cgi-bin/ -> $(root)$(cgidir)/"; \
 		(cd $(TOP)/cgi-bin/ && $(TAR) cf - *) |\
-		(cd $(root)$(datadir)/cgi-bin/ && $(TAR) xf -); \
-		find $(root)$(datadir)/cgi-bin/ -type d -exec chmod a+rx {} \; ; \
-		find $(root)$(datadir)/cgi-bin/ -type f -exec chmod a+r {} \; ; \
+		(cd $(root)$(cgidir)/ && $(TAR) xf -); \
+		find $(root)$(cgidir)/ -type d -exec chmod a+rx {} \; ; \
+		find $(root)$(cgidir)/ -type f -exec chmod a+r {} \; ; \
+		find $(root)$(cgidir)/ -type f -exec chmod a-x {} \; ; \
 	fi
-	@echo "Copying tree $(TOP)/icons/ -> $(root)$(datadir)/icons/"; \
+	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
 	(cd $(TOP)/icons/ && $(TAR) cf - *) |\
-	(cd $(root)$(datadir)/icons/ && $(TAR) xf -); \
-	find $(root)$(datadir)/icons/ -type d -exec chmod a+rx {} \; ;\
-	find $(root)$(datadir)/icons/ -type f -exec chmod a+r {} \;
+	(cd $(root)$(iconsdir)/ && $(TAR) xf -); \
+	find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
+	find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
 	@echo "<=== [data]"

 #   create the initial configuration by providing default files
@@ -360,44 +384,52 @@
 install-config:
 	@echo "===> [config: Installing Apache configuration files]"
 	-@for conf in httpd.conf access.conf srm.conf; do \
+		dst=$$conf; \
+		if [ "$${conf}" = "httpd.conf"  ]; then dst="$(server_config_file)"  ; fi; \
+		if [ "$${conf}" = "access.conf" ]; then dst="$(access_config_file)"  ; fi; \
+		if [ "$${conf}" = "srm.conf"    ]; then dst="$(resource_config_file)"; fi; \
 		(echo "##"; \
 		 echo "## $${conf} -- Apache HTTP server configuration file"; \
 		 echo "##"; \
 		 echo ""; \
 		 cat $(TOP)/conf/$${conf}-dist ) |\
-		 sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
-			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-			-e 's;@@ServerRoot@@/htdocs;$(datadir)/htdocs;' \
-			-e 's;@@ServerRoot@@/icons;$(datadir)/icons;' \
-			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
+		 sed -e '/# LoadModule/r $(SRC)/.apaci.install.conf' \
+			-e 's;@@ServerRoot@@/htdocs;$(documentroot);' \
+			-e 's;@@ServerRoot@@/htdocs;$(documentroot);' \
+			-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
+			-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
 			-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
 			-e 's;@@ServerRoot@@;$(prefix);' \
-			-e 's;logs/accept.lock;$(runtimedir)/httpd.lock;' \
-			-e 's;logs/apache_runtime_status;$(runtimedir)/httpd.scoreboard;' \
-			-e 's;logs/httpd.pid;$(runtimedir)/httpd.pid;' \
-			-e 's;logs/access_log;$(logfiledir)/access_log;' \
-			-e 's;logs/error_log;$(logfiledir)/error_log;' \
-			-e 's;logs/referer_log;$(logfiledir)/referer_log;' \
-			-e 's;logs/agent_log;$(logfiledir)/agent_log;' \
-			-e 's;conf/magic;$(sysconfdir)/magic;' \
-        	> $(TOP)/$(SRC)/.apaci.install.tmp && \
-		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}.default";
\
-		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${conf}.default;
\
-		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
-			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${conf}"; \
-			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${conf}; \
+			-e 's;@@UserDir@@;$(userdir);' \
+			-e 's;logs/accept.lock;$(runtimedir)/$(default_lockfile);' \
+			-e 's;logs/apache_runtime_status;$(runtimedir)/$(default_scoreboard);' \
+			-e 's;logs/httpd.pid;$(runtimedir)/$(default_pidlog);' \
+			-e 's;logs/access_log;$(logfiledir)/$(default_xferlog);' \
+			-e 's;logs/error_log;$(logfiledir)/$(default_errorlog);' \
+			-e 's;logs/referer_log;$(logfiledir)/$(default_refererlog);' \
+			-e 's;logs/agent_log;$(logfiledir)/$(default_agentlog);' \
+			-e 's;conf/magic;$(sysconfdir)/$(magic_config_file);' \
+        	> $(SRC)/.apaci.install.tmp && \
+		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${dst}.default";
\
+		$(INSTALL_DATA) $(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${dst}.default; \
+		if [ ! -f "$(root)$(sysconfdir)/$${dst}" ]; then \
+			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${dst}"; \
+			$(INSTALL_DATA) $(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${dst}; \
 		else \
-			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
+			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${dst}]"; \
 		fi; \
 	done
 	-@for conf in mime.types magic; do \
-		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
-		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
-		if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
-			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
-			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
+		dst=$$conf; \
+		if [ "$${conf}" = "mime.types" ]; then dst="$(types_config_file)"; fi; \
+		if [ "$${conf}" = "magic"      ]; then dst="$(magic_config_file)"; fi; \
+		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${dst}.default"; \
+		$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${dst}.default; \
+		if [ ! -f "$(root)$(sysconfdir)/$${dst}" ]; then \
+			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${dst}"; \
+			$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${dst}; \
 		else \
-			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
+			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${dst}]"; \
 		fi; \
 	done
 	@echo "<=== [config]"
@@ -413,16 +445,16 @@
 	@echo "===> $(SRC)"
 	@$(MAKE) -f $(MKF) $(MFLAGS) $(MFWD) clean-std $(clean-support)
 	@echo "<=== $(SRC)"
-	@$(RM) $(TOP)/$(SRC)/.apaci.build.ok
+	@$(RM) $(SRC)/.apaci.build.ok

 #   clean the standard stuff
 clean-std:
-	@cd $(TOP)/$(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ clean
+	@cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ clean

 #   clean additional support stuff
 clean-support:
 	@echo "===> $(SRC)/support"; \
-	    cd $(TOP)/$(SRC)/support; $(MAKE) $(MFLAGS) clean; \
+	    cd $(SRC)/support; $(MAKE) $(MFLAGS) clean; \
 	    if [ ".$(suexec)" = .1 ]; then \
 	        echo "$(RM) suexec"; \
 	        $(RM) suexec; \
@@ -450,11 +482,11 @@

 #   clean the standard stuff
 distclean-std:
-	@cd $(TOP)/$(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ distclean
+	@cd $(SRC); $(MAKE) $(MFLAGS) SDP=$(SRC)/ distclean

 distclean-support:
 	@echo "===> $(SRC)/support"; \
-	cd $(TOP)/$(SRC)/support; $(MAKE) $(MFLAGS) distclean; \
+	cd $(SRC)/support; $(MAKE) $(MFLAGS) distclean; \
 	if [ ".$(suexec)" = .1 ]; then \
 	    echo "$(RM) suexec"; \
 	    $(RM) suexec; \
@@ -464,7 +496,7 @@
 distclean-shadow:
 	$(RM) -r $(SRC)
 	$(RM) $(MKF)
-	-@if [ ".`ls $(TOP)/src.* 2>/dev/null`" = . ]; then \
+	-@if [ ".`ls src.* 2>/dev/null`" = . ]; then \
 		echo "$(RM) Makefile"; \
 		$(RM) Makefile; \
 	fi
Index: CoreOS/Services/apache/apache/configure
diff -u CoreOS/Services/apache/apache/configure:1.1.1.1 CoreOS/Services/apache/apache/configure:1.6
--- CoreOS/Services/apache/apache/configure:1.1.1.1	Tue Jun 16 08:35:23 1998
+++ CoreOS/Services/apache/apache/configure	Sun Jun 21 21:58:55 1998
@@ -69,7 +69,7 @@
 ##  the paths to the Apache source tree
 ##

-top=.
+top=`pwd`
 mkf=Makefile
 src=src
 aux=src/helpers
@@ -173,6 +173,11 @@
 runtimedir='$localstatedir/run'
 logfiledir='$localstatedir/log'
 proxycachedir='$localstatedir/proxy'
+documentroot='$datadir/htdocs'
+cgidir='$datadir/cgi-bin'
+iconsdir='$datadir/icons'
+userdir='public_html'
+httpd='httpd'

 #   customization flags for
 #   automatic "apache" suffix
@@ -181,6 +186,20 @@
 customized_localstatedir=0
 customized_includedir=0

+# File names
+default_pidlog='httpd.pid'
+default_scoreboard='httpd.scoreboard'
+default_lockfile='httpd.lock'
+default_xferlog='access_log'
+default_errorlog='error_log'
+default_refererlog='referer_log'
+default_agentlog='agent_log'
+types_config_file='mime.types'
+magic_config_file='magic'
+server_config_file='httpd.conf'
+access_config_file='access.conf'
+resource_config_file='srm.conf'
+
 #   check and debug
 layout=0

@@ -215,7 +234,6 @@

 #   determine modules
 rm -f $addconf 2>/dev/null
-touch $addconf
 modules=""
 modulelist=""
 OIFS="$IFS" IFS='
@@ -287,36 +305,53 @@
         --verbose | -v)
             verbose=yes
             ;;
-        --shadow)
+        --shadow*)
+	    case "$apc_option" in
+		--shadow)
+        	    shadow="."
+		    ;;
+		--shadow=*)
+	            shadow="$apc_optarg"
+		    if [ ! -d "$shadow" ]; then
+			$aux/mkdir.sh "$shadow"
+		    fi
+		    ;;
+	    esac
             #   determine GNU platform triple
             gnutriple=`$aux/GuessOS | $AWK '{ printf("%s",$1); }' | sed -e 's:/:-:g'`
             #   create Makefile wrapper (the first time only)
-            if [ ".`ls $top/src.* 2>/dev/null`" = . ]; then
+            if [ ".`ls src.* 2>/dev/null`" = . ]; then
                 if [ .$quiet = .no ]; then
                     echo " + creating Makefile (shadow wrapper)"
                 fi
-                echo "##" > Makefile
-                echo "##  Apache Makefile (shadow wrapper)" >> Makefile
-                echo "##" >> Makefile
-                echo "" >> Makefile
-                echo "GNUTRIPLE=\`$aux/GuessOS | $AWK '{ printf(\"%s\",\$\$1); }' | sed -e
's:/:-:g'\`" >> Makefile
-                echo "" >> Makefile
-                echo "all build install install-quiet clean distclean:" >> Makefile
-                echo "	@\$(MAKE) -f Makefile.\$(GNUTRIPLE) \$(MFLAGS) \$@" >> Makefile
-                echo "" >> Makefile
+                echo "##" > "$shadow/Makefile"
+                echo "##  Apache Makefile (shadow wrapper)" >> "$shadow/Makefile"
+                echo "##" >> "$shadow/Makefile"
+                echo "" >> "$shadow/Makefile"
+                echo "GNUTRIPLE=\``pwd`/$aux/GuessOS | $AWK '{ printf(\"%s\",\$\$1); }' |
sed -e 's:/:-:g'\`" >> "$shadow/Makefile"
+                echo "" >> "$shadow/Makefile"
+                echo "all build install install-quiet clean distclean:" >> "$shadow/Makefile"
+                echo "	@\$(MAKE) -f Makefile.\$(GNUTRIPLE) \$(MFLAGS) \$@" >> "$shadow/Makefile"
+                echo "" >> "$shadow/Makefile"
+                echo "install-strip: install" >> "$shadow/Makefile"
+                echo "" >> "$shadow/Makefile"
             fi
             #   set shadow paths
-            shadowmkf="Makefile.$gnutriple"
-            shadowsrc="src.$gnutriple"
-            shadowaux="src.$gnutriple/helpers"
-            shadowsedsubst="src.$gnutriple/.apaci.sedsubst"
-            shadowaddconf="src.$gnutriple/.apaci.addconf"
+            shadowmkf="$shadow/Makefile.$gnutriple"
+            shadowsrc="$shadow/src.$gnutriple"
+            shadowaux="$shadowsrc/helpers"
+            shadowsedsubst="$shadowsrc/.apaci.sedsubst"
+            shadowaddconf="$shadowsrc/.apaci.addconf"
             #   (re)create shadow tree
             if [ .$quiet = .no ]; then
                 echo " + create shadow tree ($shadowsrc)"
             fi
             rm -rf $shadowsrc
-            $aux/mkshadow.sh $src $shadowsrc
+	    if [ "$shadow" = "." ]; then
+                $aux/mkshadow.sh $src $shadowsrc
+	    else
+		$aux/mkshadow.sh `pwd`/$src $shadowsrc
+	    fi
             #   delegate us to the shadow paths
             mkf=$shadowmkf
             src=$shadowsrc
@@ -325,7 +360,6 @@
             rm -f $addconf 2>/dev/null
             addconf=$shadowaddconf
             rm -f $addconf 2>/dev/null
-            touch $addconf
             ;;
         --help | -h | -help )
             echo "Usage: configure [options]"
@@ -353,7 +387,13 @@
             echo " --runtimedir=DIR       install runtime data in DIR          [PREFIX/var/run]"
             echo " --logfiledir=DIR       install logfile data in DIR          [PREFIX/var/log]"
             echo " --proxycachedir=DIR    install proxy cache data in DIR      [PREFIX/var/proxy]"
+            echo " --documentroot=DIR     install documents in DIR             [DATADIR/htdocs]"
+            echo " --cgidir=DIR           install cgi programs in DIR          [DATADIR/cgi-bin]"
+            echo " --iconsdir=DIR         install icons in DIR                 [DATADIR/icons]"
+            echo " --userdir=DIR          set user (relative) directory to DIR [public_html]"
+            echo " --httpd=NAME           set name of httpd executable         [httpd]"
             echo " --compat               install with old Apache 1.2 installation paths"
+            echo " --pretty               install with pretty filenames"
             echo ""
             echo "Configuration options:"
             echo " --enable-rule=NAME     enable  a particular Rule named 'NAME'"
@@ -425,6 +465,21 @@
         --proxycachedir=*)
             proxycachedir="$apc_optarg"
             ;;
+        --cgidir=*)
+            cgidir="$apc_optarg"
+            ;;
+        --documentroot=*)
+            documentroot="$apc_optarg"
+            ;;
+        --iconsdir=*)
+            iconsdir="$apc_optarg"
+            ;;
+        --userdir=*)
+            userdir="$apc_optarg"
+            ;;
+        --httpd=*)
+            httpd="$apc_optarg"
+            ;;
         --compat)
             exec_prefix='$prefix'
             bindir='$exec_prefix/bin'
@@ -443,6 +498,20 @@
             customized_localstatedir=1
             customized_includedir=1
             ;;
+        --pretty)
+	    default_pidlog='ProcessID'
+	    default_scoreboard='Status'
+	    default_lockfile='Lock'
+	    default_xferlog='Access'
+	    default_errorlog='Error'
+	    default_refererlog='Referers'
+	    default_agentlog='UserAgents'
+	    types_config_file='MIME'
+	    magic_config_file='Magic'
+	    server_config_file='Server'
+	    access_config_file='Access'
+	    resource_config_file='Resources'
+	    ;;
         --add-module=*)
             file="$apc_optarg"
             if [ ".`echo $file | egrep '/?mod_[a-zA-Z0-9][a-zA-Z0-9_]*\.c$'`" = . ]; then
@@ -458,6 +527,7 @@
             if [ ".$file" != ".$src/modules/extra/$modfilec" ]; then
                 cp $file $src/modules/extra/$modfilec
             fi
+	    if [ ! -f $addconf ]; then touch $addconf; fi
             echo "" >>$addconf
             echo "## On-the-fly added module" >>$addconf
             echo "## (configure --add-module=$file)" >>$addconf
@@ -484,6 +554,7 @@
                     ;;
             esac
             modfile=`echo $file | sed -e 's;^src/;;'`
+	    if [ ! -f $addconf ]; then touch $addconf; fi
             echo "" >>$addconf
             echo "## On-the-fly activated module" >>$addconf
             echo "## (configure --activate-module=$file)" >>$addconf
@@ -683,6 +754,7 @@
     echo "configure:Error: missing argument to --`echo $apc_prev | sed 's/_/-/g'`" 1>&2
     exit 1
 fi
+touch $addconf

 ##
 ##  a few errors
@@ -722,7 +794,8 @@
 for var in prefix exec_prefix bindir sbindir \
            libexecdir mandir sysconfdir datadir \
            includedir localstatedir runtimedir \
-           logfiledir proxycachedir; do
+           logfiledir proxycachedir documentroot \
+	   cgidir iconsdir; do
     eval "val=\"\$$var\"";
     val=`echo $val | sed -e 's:/*$::'`
     eval "$var=\"$val\""
@@ -790,20 +863,25 @@
     echo "           runtimedir: $runtimedir"
     echo "           logfiledir: $logfiledir"
     echo "        proxycachedir: $proxycachedir"
+    echo "         documentroot: $documentroot"
+    echo "               cgidir: $cgidir"
+    echo "             iconsdir: $iconsdir"
+    echo "              userdir: $userdir"
+    echo "                httpd: $httpd"
     echo ""
     echo "Compilation paths:"
     echo "           HTTPD_ROOT: $prefix"
     echo "           SUEXEC_BIN: $sbindir/suexec"
     echo "      SHARED_CORE_DIR: $libexecdir"
-    echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
-    echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
-    echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
-    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
-    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
-    echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-    echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
-    echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
-    echo " RESOURCE_CONFIG_FILE: ${sysconfdir_relative}srm.conf"
+    echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${default_pidlog}"
+    echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${default_scoreboard}"
+    echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${default_lockfile}"
+    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}${default_xferlog}"
+    echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}${default_errorlog}"
+    echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}${types_config_file}"
+    echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${server_config_file}"
+    echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}${access_config_file}"
+    echo " RESOURCE_CONFIG_FILE: ${sysconfdir_relative}${resource_config_file}"
     echo ""
     exit 0
 fi
@@ -834,6 +912,23 @@
 -e "s%@runtimedir@%$runtimedir%g" \
 -e "s%@logfiledir@%$logfiledir%g" \
 -e "s%@proxycachedir@%$proxycachedir%g" \
+-e "s%@documentroot@%$documentroot%g" \
+-e "s%@cgidir@%$cgidir%g" \
+-e "s%@iconsdir@%$iconsdir%g" \
+-e "s%@userdir@%$userdir%g" \
+-e "s%@httpd@%$httpd%g" \
+-e "s%@default_pidlog@%$default_pidlog%g" \
+-e "s%@default_scoreboard@%$default_scoreboard%g" \
+-e "s%@default_lockfile@%$default_lockfile%g" \
+-e "s%@default_xferlog@%$default_xferlog%g" \
+-e "s%@default_errorlog@%$default_errorlog%g" \
+-e "s%@default_refererlog@%$default_refererlog%g" \
+-e "s%@default_agentlog@%$default_agentlog%g" \
+-e "s%@types_config_file@%$types_config_file%g" \
+-e "s%@magic_config_file@%$magic_config_file%g" \
+-e "s%@server_config_file@%$server_config_file%g" \
+-e "s%@access_config_file@%$access_config_file%g" \
+-e "s%@resource_config_file@%$resource_config_file%g" \
 -e "s%@suexec@%$suexec%g" \
 -e "s%@suexec_caller@%$suexec_caller%g" \
 -e "s%@suexec_userdir@%$suexec_userdir%g" \
@@ -856,15 +951,15 @@
 echo "echo '-DHTTPD_ROOT=\"$prefix\"'" >>$src/apaci
 echo "echo '-DSUEXEC_BIN=\"$sbindir/suexec\"'" >>$src/apaci
 echo "echo '-DSHARED_CORE_DIR=\"$libexecdir\"'" >>$src/apaci
-echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
-echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
-echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
-echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
-echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
-echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
-echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
-echo "echo '-DRESOURCE_CONFIG_FILE=\"${sysconfdir_relative}srm.conf\"'" >>$src/apaci
+echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${default_pidlog}\"'" >>$src/apaci
+echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${default_scoreboard}\"'" >>$src/apaci
+echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${default_lockfile}\"'" >>$src/apaci
+echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}${default_xferlog}\"'" >>$src/apaci
+echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}${default_errorlog}\"'" >>$src/apaci
+echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}${types_config_file}\"'" >>$src/apaci
+echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${server_config_file}\"'" >>$src/apaci
+echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}${access_config_file}\"'" >>$src/apaci
+echo "echo '-DRESOURCE_CONFIG_FILE=\"${sysconfdir_relative}${resource_config_file}\"'" >>$src/apaci
 chmod a+x $src/apaci
 CFLAGS="$CFLAGS \\\`\$(SRCDIR)/apaci\\\`"

Index: CoreOS/Services/apache/apache/conf/access.conf-dist
diff -u CoreOS/Services/apache/apache/conf/access.conf-dist:1.1.1.2 CoreOS/Services/apache/apache/conf/access.conf-dist:1.2
--- CoreOS/Services/apache/apache/conf/access.conf-dist:1.1.1.2	Tue Jun 16 08:36:02 1998
+++ CoreOS/Services/apache/apache/conf/access.conf-dist	Sun Jun 21 19:28:32 1998
@@ -25,7 +25,7 @@

 # This should be changed to whatever you set DocumentRoot to.

-<Directory @@ServerRoot@@/htdocs>
+<Directory "@@ServerRoot@@/htdocs">

 # This may also be "None", "All", or any combination of "Indexes",
 # "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
@@ -51,7 +51,7 @@
 # @@ServerRoot@@/cgi-bin should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.

-<Directory @@ServerRoot@@/cgi-bin>
+<Directory "@@ServerRoot@@/cgi-bin">
 AllowOverride None
 Options None
 </Directory>
Index: CoreOS/Services/apache/apache/conf/httpd.conf-dist
diff -u CoreOS/Services/apache/apache/conf/httpd.conf-dist:1.1.1.3 CoreOS/Services/apache/apache/conf/httpd.conf-dist:1.2
--- CoreOS/Services/apache/apache/conf/httpd.conf-dist:1.1.1.3	Tue Jun 16 08:36:03 1998
+++ CoreOS/Services/apache/apache/conf/httpd.conf-dist	Sun Jun 21 19:28:33 1998
@@ -50,7 +50,7 @@
 #  don't use Group #-1 on these systems!

 User nobody
-Group #-1
+Group nogroup

 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.
@@ -63,7 +63,7 @@
 # mounted filesystem then please read the LockFile documentation,
 # you will save yourself a lot of trouble.

-ServerRoot @@ServerRoot@@
+ServerRoot "@@ServerRoot@@"

 # BindAddress: You can support virtual hosts with this option. This option
 # is used to tell the server which IP address to listen to. It can either
@@ -75,7 +75,7 @@
 # ErrorLog: The location of the error log file. If this does not start
 # with /, ServerRoot is prepended to it.

-ErrorLog logs/error_log
+ErrorLog "logs/error_log"

 # LogLevel: Control the number of messages logged to the error_log.
 # Possible values include: debug, info, notice, warn, error, crit,
@@ -94,21 +94,21 @@
 # The location of the access logfile (Common Logfile Format).
 # If this does not start with /, ServerRoot is prepended to it.

-CustomLog logs/access_log common
+CustomLog "logs/access_log" common

 # If you would like to have an agent and referer logfile uncomment the
 # following directives.

-#CustomLog logs/referer_log referer
-#CustomLog logs/agent_log agent
+#CustomLog "logs/referer_log" referer
+#CustomLog "logs/agent_log" agent

 # If you prefer a single logfile with access, agent and referer information
 # (Combined Logfile Format) you can use the following directive.

-#CustomLog logs/access_log combined
+#CustomLog "logs/access_log" combined

 # PidFile: The file the server should log its pid to
-PidFile logs/httpd.pid
+PidFile "logs/httpd.pid"

 # ScoreBoardFile: File used to store internal server process information.
 # Not all architectures require this.  But if yours does (you'll know because
@@ -124,7 +124,7 @@
 # DISK. The PID of the main server process is automatically appended to
 # the filename.
 #
-#LockFile logs/accept.lock
+#LockFile "logs/accept.lock"

 # ServerName allows you to set a host name which is sent back to clients for
 # your server if it's different than the one the program would get (i.e. use
@@ -213,7 +213,7 @@

 # To enable the cache as well, edit and uncomment the following lines:

-#CacheRoot @@ServerRoot@@/proxy
+#CacheRoot "@@ServerRoot@@/proxy"
 #CacheSize 5
 #CacheGcInterval 4
 #CacheMaxExpire 24
Index: CoreOS/Services/apache/apache/conf/srm.conf-dist
diff -u CoreOS/Services/apache/apache/conf/srm.conf-dist:1.1.1.2 CoreOS/Services/apache/apache/conf/srm.conf-dist:1.3
--- CoreOS/Services/apache/apache/conf/srm.conf-dist:1.1.1.2	Tue Jun 16 08:36:05 1998
+++ CoreOS/Services/apache/apache/conf/srm.conf-dist	Tue Jun 23 21:08:30 1998
@@ -12,12 +12,12 @@
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.

-DocumentRoot @@ServerRoot@@/htdocs
+DocumentRoot "@@ServerRoot@@/htdocs"

 # UserDir: The name of the directory which is appended onto a user's home
 # directory if a ~user request is recieved.

-UserDir public_html
+UserDir "@@UserDir@@"

 # DirectoryIndex: Name of the file or files to use as a pre-written HTML
 # directory index.  Separate multiple entries with spaces.
@@ -135,12 +135,12 @@
 # require it to be present in the URL.  So "/icons" isn't aliased in this
 # example.

-Alias /icons/ @@ServerRoot@@/icons/
+Alias /icons/ "@@ServerRoot@@/icons/"

 # ScriptAlias: This controls which directories contain server scripts.
 # Format: ScriptAlias fakename realname

-#ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/
+ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"

 # If you want to use server side includes, or CGI outside
 # ScriptAliased directories, uncomment the following lines.
Index: CoreOS/Services/apache/apache/src/helpers/mkshadow.sh
diff -u CoreOS/Services/apache/apache/src/helpers/mkshadow.sh:1.1.1.1 CoreOS/Services/apache/apache/src/helpers/mkshadow.sh:1.2
--- CoreOS/Services/apache/apache/src/helpers/mkshadow.sh:1.1.1.1	Tue Jun 16 08:35:37 1998
+++ CoreOS/Services/apache/apache/src/helpers/mkshadow.sh	Sun Jun 21 21:58:56 1998
@@ -12,8 +12,8 @@
 '

 #   source and destination directory
-src=`echo $1 | sed -e 's:/$::'`
-dst=`echo $2 | sed -e 's:/$::'`
+src=`echo $1 | sed -e 's:/$::' | sed -e 's:^./::'`
+dst=`echo $2 | sed -e 's:/$::' | sed -e 's:^./::'`

 #   determine if source is an absolute path
 case $src in
Index: CoreOS/Services/apache/apache/src/support/apxs.pl
diff -u CoreOS/Services/apache/apache/src/support/apxs.pl:1.1.1.1 CoreOS/Services/apache/apache/src/support/apxs.pl:1.2
--- CoreOS/Services/apache/apache/src/support/apxs.pl:1.1.1.1	Tue Jun 16 08:36:02 1998
+++ CoreOS/Services/apache/apache/src/support/apxs.pl	Sun Jun 21 21:17:57 1998
@@ -78,6 +78,7 @@
 my $CFG_INCLUDEDIR    = '@includedir@';    # substituted via APACI install
 my $CFG_LIBEXECDIR    = '@libexecdir@';    # substituted via APACI install
 my $CFG_SYSCONFDIR    = '@sysconfdir@';    # substituted via APACI install
+my $CFG_HTTPD         = '@httpd@';         # substituted via APACI install

 ##
 ##  Cleanup the above stuff
@@ -89,11 +90,11 @@
 ##
 ##  Initial shared object support check
 ##
-if (not grep(/mod_so/, `$CFG_SBINDIR/httpd -l`)) {
+if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_HTTPD -l`)) {
     print STDERR "apxs:Error: Sorry, no shared object support for Apache\n";
     print STDERR "apxs:Error: available under your platform. Make sure\n";
     print STDERR "apxs:Error: the Apache module mod_so is compiled into\n";
-    print STDERR "apxs:Error: your server binary `$CFG_SBINDIR/httpd'.\n";
+    print STDERR "apxs:Error: your server binary `$CFG_SBINDIR/$CFG_HTTPD'.\n";
     exit(1);
 }


Mime
View raw message