httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Ralf S. Engelschall" <...@engelschall.com>
Subject [PATCH] Configuration (4/4): TARGET name
Date Tue, 01 Dec 1998 14:14:44 GMT

Configuration (4/4): TARGET name [config-target]
------------------------------------------------

This patch tries to complete the TARGET-related part of Randys recently posted
patch (which addressed only a few issues). The idea is to make the TARGET
variable more generic and wider applicable so it can be used to change the
installation name from "httpd" to "apache", "httpsd" or whatever. The default
is still "httpd", of course. But when you say TARGET=apache you get

  o a binary "apache" instead of "httpd"
  o DSO files libapache.* instead of libhttpd.*
  o config file apache.conf instead of httpd.conf
  o error messages with prefix "apache:" instead of "httpd:"

Support for the TARGET variable is added to src/Configure, APACI and APXS, of
course.  I've still used the name "TARGET" for the variable to keep with the
tradition, although I personally find it not very intuitive here. So
additionally when we should decide that this patch is a good one we can change
it to a more reasonable name. Perhaps something like HTTPD_NAME (to be
consistent with HTTPD_ROOT) or PROGRAM_NAME or whatever.

                                       Ralf S. Engelschall
                                       rse@engelschall.com
                                       www.engelschall.com
Index: Makefile.tmpl
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/Makefile.tmpl,v
retrieving revision 1.50
diff -u -r1.50 Makefile.tmpl
--- Makefile.tmpl	1998/11/13 11:25:01	1.50
+++ Makefile.tmpl	1998/12/01 14:05:56
@@ -88,6 +88,9 @@
 INSTALL_DATA    = $(INSTALL) -m 644
 PERL            = @PERL@
 
+#   installation name of Apache webserver
+TARGET          = @TARGET@
+
 #   installation root 
 #   (overrideable by package maintainers for
 #   rolling packages without bristling the system)
@@ -201,7 +204,7 @@
 		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)/{$(TARGET),access,srm}.conf"; \
 		echo "|                                                        |"; \
 		echo "| and then you should be able to immediately fire up     |"; \
 		echo "| Apache the first time by running:                      |"; \
@@ -238,26 +241,26 @@
 #   install the server program and optionally corresponding
 #   shared object files.
 install-programs:
-	@echo "===> [programs: Installing Apache httpd program and shared objects]"
-	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/httpd $(root)$(sbindir)/httpd
+	@echo "===> [programs: Installing Apache $(TARGET) program and shared objects]"
+	$(INSTALL_PROGRAM) $(TOP)/$(SRC)/$(TARGET) $(root)$(sbindir)/$(TARGET)
 	-@if [ ".`grep 'SUBTARGET=target_shared' $(TOP)/$(SRC)/Makefile`" != . ]; then \
 		SHLIB_SUFFIX_NAME="`grep '^SHLIB_SUFFIX_NAME=' $(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`";
\
 		SHLIB_SUFFIX_LIST="`grep '^SHLIB_SUFFIX_LIST=' $(TOP)/$(SRC)/Makefile | sed -e 's:^.*=::'`";
\
-		echo "$(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.ep $(root)$(libexecdir)/libhttpd.ep"; \
-		$(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.ep $(root)$(libexecdir)/libhttpd.ep; \
-		echo "$(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME} $(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}";
\
-		$(INSTALL_DSO) $(TOP)/$(SRC)/libhttpd.$${SHLIB_SUFFIX_NAME} $(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME};
\
+		echo "$(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).ep $(root)$(libexecdir)/lib$(TARGET).ep";
\
+		$(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).ep $(root)$(libexecdir)/lib$(TARGET).ep; \
+		echo "$(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).$${SHLIB_SUFFIX_NAME} $(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}";
\
+		$(INSTALL_DSO) $(TOP)/$(SRC)/lib$(TARGET).$${SHLIB_SUFFIX_NAME} $(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME};
\
 		if [ ".$${SHLIB_SUFFIX_LIST}" != . ]; then \
-			echo "$(RM) $(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.*"; \
-			$(RM) $(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.*; \
+			echo "$(RM) $(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}.*"; \
+			$(RM) $(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}.*; \
 			for suffix in $${SHLIB_SUFFIX_LIST} ""; do \
 				[ ".$${suffix}" = . ] && continue; \
-				echo "$(LN) $(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME} $(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.$${suffix}";
\
-				$(LN) $(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME} $(root)$(libexecdir)/libhttpd.$${SHLIB_SUFFIX_NAME}.$${suffix};
\
+				echo "$(LN) $(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME} $(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}.$${suffix}";
\
+				$(LN) $(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME} $(root)$(libexecdir)/lib$(TARGET).$${SHLIB_SUFFIX_NAME}.$${suffix};
\
 			done; \
 		fi; \
 	fi
-	$(INSTALL_DATA) $(TOP)/$(SRC)/support/httpd.8 $(root)$(mandir)/man8/httpd.8
+	$(INSTALL_DATA) $(TOP)/$(SRC)/support/httpd.8 $(root)$(mandir)/man8/$(TARGET).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 |\
@@ -288,8 +291,8 @@
 	$(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;' \
+	sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
+		-e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
 		< $(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
@@ -374,6 +377,11 @@
 install-config:
 	@echo "===> [config: Installing Apache configuration files]"
 	-@for conf in httpd.conf access.conf srm.conf; do \
+		if [ .$$conf = .httpd.conf ]; then \
+			target_conf="$(TARGET).conf"; \
+		else \
+			target_conf="$$conf"; \
+		fi; \
 		(echo "##"; \
 		 echo "## $${conf} -- Apache HTTP server configuration file"; \
 		 echo "##"; \
@@ -385,9 +393,9 @@
 			-e 's;@@ServerRoot@@/cgi-bin;$(datadir)/cgi-bin;' \
 			-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/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/access_log;$(logfiledir)/access_log;' \
 			-e 's;logs/error_log;$(logfiledir)/error_log;' \
 			-e 's;logs/referer_log;$(logfiledir)/referer_log;' \
@@ -399,13 +407,13 @@
 			-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
 			-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
         	> $(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}; \
+		echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default";
\
+		$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default;
\
+		if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
+			echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}";
\
+			$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf};
\
 		else \
-			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${conf}]"; \
+			echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${target_conf}]"; \
 		fi; \
 	done
 	-@for conf in mime.types magic; do \
Index: configure
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/configure,v
retrieving revision 1.50
diff -u -r1.50 configure
--- configure	1998/11/08 21:24:01	1.50
+++ configure	1998/12/01 13:56:23
@@ -164,6 +164,11 @@
 ##  determine default parameters
 ##
 
+#   target name
+if [ ".$TARGET" = . ]; then
+    TARGET=httpd
+fi
+
 #   default paths
 prefix='/usr/local/apache'
 exec_prefix='$prefix'
@@ -285,7 +290,7 @@
     echo "##" >>$configstatus
     echo "" >>$configstatus
     for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
-               LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do
+               LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB TARGET; do
         eval "val=\"\$$var\""
         if [ ".$val" != . ]; then
             echo "$var=$val" |\
@@ -907,13 +912,13 @@
     echo "Compilation paths:"
     echo "           HTTPD_ROOT: $prefix"
     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_PIDLOG: ${runtimedir_relative}${TARGET}.pid"
+    echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${TARGET}.scoreboard"
+    echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${TARGET}.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 "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${TARGET}.conf"
     echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
     echo " RESOURCE_CONFIG_FILE: ${sysconfdir_relative}srm.conf"
     echo ""
@@ -944,6 +949,7 @@
 -e "s%@SRC@%$src%g" \
 -e "s%@MKF@%$mkf%g" \
 -e "s%@AUX@%$aux%g" \
+-e "s%@TARGET@%$TARGET%g" \
 -e "s%@prefix@%$prefix%g" \
 -e "s%@exec_prefix@%$exec_prefix%g" \
 -e "s%@bindir@%$bindir%g" \
@@ -986,13 +992,13 @@
 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_PIDLOG=\"${runtimedir_relative}${TARGET}.pid\"'" >>$src/apaci
+echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${TARGET}.scoreboard\"'" >>$src/apaci
+echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${TARGET}.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 '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${TARGET}.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
 chmod a+x $src/apaci
@@ -1010,7 +1016,7 @@
 #   generate settings from imported environment variables
 OIFS="$IFS" IFS="$DIFS"
 for var in CC CPP OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \
-           LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS; do
+           LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS TARGET; do
     eval "val=\"\$$var\"";
     if [ ".$val" != . ]; then
         case $var in 
Index: src/Configuration.tmpl
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/Configuration.tmpl,v
retrieving revision 1.111
diff -u -r1.111 Configuration.tmpl
--- src/Configuration.tmpl	1998/09/16 19:38:26	1.111
+++ src/Configuration.tmpl	1998/12/01 13:37:50
@@ -63,6 +63,11 @@
 #RANLIB=
 
 ################################################################
+# Name of the installed Apache HTTP webserver.
+#
+#TARGET=
+
+################################################################
 # Dynamic Shared Object (DSO) support
 #
 # There is experimental support for compiling the Apache core and
Index: src/Configure
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/Configure,v
retrieving revision 1.306
diff -u -r1.306 Configure
--- src/Configure	1998/11/11 18:36:07	1.306
+++ src/Configure	1998/12/01 13:48:01
@@ -254,7 +254,6 @@
 DBM_LIB="-ldbm"
 DB_LIB="-ldb"
 SHELL="/bin/sh"
-TARGET="httpd"
 SUBTARGET="target_static"
 SHLIB_SUFFIX_NAME=""
 SHLIB_SUFFIX_LIST=""
@@ -888,6 +887,7 @@
 ##
 TOPTIM=`egrep '^OPTIM=' Makefile.config | tail -1 | awk -F= '{print $2}'`
 TRANLIB=`egrep '^RANLIB=' Makefile.config | tail -1 | awk -F= '{print $2}'`
+TTARGET=`egrep '^TARGET=' Makefile.config | tail -1 | awk -F= '{print $2}'`
 
 ####################################################################
 ## Check for user provided flags for shared object support
@@ -898,6 +898,20 @@
 TCFLAGS_SHLIB=`egrep '^CFLAGS_SHLIB=' Makefile.config | tail -1 | awk -F= '{print $2}'`
 
 ####################################################################
+## Handle TARGET name
+##
+if [ "x$TTARGET" = "x" ]; then
+    TARGET=httpd
+    echo "TARGET=$TARGET" >> Makefile.config
+else
+    TARGET=$TTARGET
+fi
+if [ "x$TARGET" != "xhttpd" ]; then
+    echo " + using custom target name: $TARGET"
+    CFLAGS="$CFLAGS -DTARGET=\\\"$TARGET\\\""
+fi
+
+####################################################################
 ## We adjust now CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT as
 ## required.  For more platforms just add the required lines below.
 ##
@@ -1710,7 +1724,6 @@
 ####################################################################
 ## Now add the target for the main Makefile
 ##
-echo "TARGET=$TARGET" >> Makefile
 echo "SUBDIRS=$SUBDIRS" >> Makefile
 echo "SUBTARGET=$SUBTARGET" >> Makefile
 echo "SHLIB_SUFFIX_NAME=$SHLIB_SUFFIX_NAME" >> Makefile
Index: src/Makefile.tmpl
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/Makefile.tmpl,v
retrieving revision 1.106
diff -u -r1.106 Makefile.tmpl
--- src/Makefile.tmpl	1998/09/17 14:43:21	1.106
+++ src/Makefile.tmpl	1998/12/01 13:29:32
@@ -30,24 +30,24 @@
 	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
 	      -o $(TARGET) buildmark.o $(OBJS) $(REGLIB) $(LIBS)
 
-target_shared: libhttpd.ep
+target_shared: lib$(TARGET).ep
 	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
 	      -o $(TARGET) -DSHARED_CORE_BOOTSTRAP main/http_main.c
 
-libhttpd.ep: libhttpd.$(SHLIB_SUFFIX_NAME)
+lib$(TARGET).ep: lib$(TARGET).$(SHLIB_SUFFIX_NAME)
 	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
-	      -o libhttpd.ep -DSHARED_CORE_TIESTATIC main/http_main.c \
-		  -L. -lhttpd $(LIBS)
+	      -o lib$(TARGET).ep -DSHARED_CORE_TIESTATIC main/http_main.c \
+		  -L. -l$(TARGET) $(LIBS)
 
-libhttpd.$(SHLIB_SUFFIX_NAME): subdirs modules.o
+lib$(TARGET).$(SHLIB_SUFFIX_NAME): subdirs modules.o
 	$(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
-	$(LD_SHLIB) $(LDFLAGS_SHLIB) -o libhttpd.$(SHLIB_SUFFIX_NAME) buildmark.o $(OBJS) $(REGLIB)
+	$(LD_SHLIB) $(LDFLAGS_SHLIB) -o lib$(TARGET).$(SHLIB_SUFFIX_NAME) buildmark.o $(OBJS) $(REGLIB)
 	@if [ ".$(SHLIB_SUFFIX_LIST)" != . ]; then \
-		rm -f libhttpd.$(SHLIB_SUFFIX_NAME).*; \
+		rm -f lib$(TARGET).$(SHLIB_SUFFIX_NAME).*; \
 		for suffix in $(SHLIB_SUFFIX_LIST) ""; do \
 			[ ".$$suffix" = . ] && continue; \
-		    echo "ln libhttpd.$(SHLIB_SUFFIX_NAME) libhttpd.$(SHLIB_SUFFIX_NAME).$$suffix"; \
-		    ln libhttpd.$(SHLIB_SUFFIX_NAME) libhttpd.$(SHLIB_SUFFIX_NAME).$$suffix; \
+		    echo "ln lib$(TARGET).$(SHLIB_SUFFIX_NAME) lib$(TARGET).$(SHLIB_SUFFIX_NAME).$$suffix";
\
+		    ln lib$(TARGET).$(SHLIB_SUFFIX_NAME) lib$(TARGET).$(SHLIB_SUFFIX_NAME).$$suffix; \
 		done; \
 	fi
 
@@ -66,7 +66,7 @@
 	echo "<=== $(SDP)support"
 
 clean:
-	-rm -f $(TARGET) libhttpd.* *.o
+	-rm -f $(TARGET) lib$(TARGET).* *.o
 	@for i in $(SUBDIRS); do \
 		echo "===> $(SDP)$$i"; \
 		( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' $@ ) || exit 1; \
@@ -74,7 +74,7 @@
 	done
 
 distclean:
-	-rm -f $(TARGET) libhttpd.* *.o
+	-rm -f $(TARGET) lib$(TARGET).* *.o
 	@for i in $(SUBDIRS); do \
 		echo "===> $(SDP)$$i"; \
 		( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' $@ ) || exit 1; \
Index: src/include/httpd.h
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/include/httpd.h,v
retrieving revision 1.252
diff -u -r1.252 httpd.h
--- src/include/httpd.h	1998/11/10 07:30:07	1.252
+++ src/include/httpd.h	1998/12/01 13:39:11
@@ -110,6 +110,11 @@
 /* Default administrator's address */
 #define DEFAULT_ADMIN "[no address given]"
 
+/* The target name of the installed Apache */
+#ifndef TARGET
+#define TARGET "httpd"
+#endif
+
 /* 
  * --------- You shouldn't have to edit anything below this line ----------
  *
Index: src/main/http_config.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/main/http_config.c,v
retrieving revision 1.135
diff -u -r1.135 http_config.c
--- src/main/http_config.c	1998/10/30 22:41:24	1.135
+++ src/main/http_config.c	1998/12/01 13:50:19
@@ -539,7 +539,7 @@
      */
 
     if (m->version != MODULE_MAGIC_NUMBER_MAJOR) {
-	fprintf(stderr, "httpd: module \"%s\" is not compatible with this "
+	fprintf(stderr, TARGET ": module \"%s\" is not compatible with this "
 		"version of Apache.\n", m->name);
 	fprintf(stderr, "Please contact the vendor for the correct version.\n");
 	exit(1);
@@ -554,7 +554,7 @@
 	dynamic_modules++;
 
 	if (dynamic_modules > DYNAMIC_MODULE_LIMIT) {
-	    fprintf(stderr, "httpd: module \"%s\" could not be loaded, because"
+	    fprintf(stderr, TARGET ": module \"%s\" could not be loaded, because"
 		    " the dynamic\n", m->name);
 	    fprintf(stderr, "module limit was reached. Please increase "
 		    "DYNAMIC_MODULE_LIMIT and recompile.\n");
@@ -1179,7 +1179,7 @@
 
     if (!(parms.config_file = ap_pcfg_openfile(p,fname))) {
 	perror("fopen");
-	fprintf(stderr, "httpd: could not open document config file %s\n",
+	fprintf(stderr, TARGET ": could not open document config file %s\n",
 		fname);
 	exit(1);
     }
Index: src/main/http_log.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/main/http_log.c,v
retrieving revision 1.73
diff -u -r1.73 http_log.c
--- src/main/http_log.c	1998/10/23 00:34:20	1.73
+++ src/main/http_log.c	1998/12/01 13:50:20
@@ -222,7 +222,7 @@
 	fname = ap_server_root_relative(p, s->error_fname);
         if (!(s->error_log = ap_pfopen(p, fname, "a"))) {
             perror("fopen");
-            fprintf(stderr,"httpd: could not open error log file %s.\n", fname);
+            fprintf(stderr,TARGET ": could not open error log file %s.\n", fname);
             exit(1);
 	}
     }
@@ -488,7 +488,7 @@
 
     if(!(pid_file = fopen(fname, "w"))) {
 	perror("fopen");
-        fprintf(stderr, "httpd: could not log pid to file %s\n", fname);
+        fprintf(stderr, TARGET ": could not log pid to file %s\n", fname);
         exit(1);
     }
     fprintf(pid_file, "%ld\n", (long)mypid);
Index: src/main/http_main.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/main/http_main.c,v
retrieving revision 1.405
diff -u -r1.405 http_main.c
--- src/main/http_main.c	1998/11/06 22:42:43	1.405
+++ src/main/http_main.c	1998/12/01 13:51:27
@@ -1612,13 +1612,13 @@
 
     m = (caddr_t) create_shared_heap("\\SHAREMEM\\SCOREBOARD", SCOREBOARD_SIZE);
     if (m == 0) {
-	fprintf(stderr, "httpd: Could not create OS/2 Shared memory pool.\n");
+	fprintf(stderr, TARGET ": Could not create OS/2 Shared memory pool.\n");
 	exit(APEXIT_INIT);
     }
 
     rc = _uopen((Heap_t) m);
     if (rc != 0) {
-	fprintf(stderr, "httpd: Could not uopen() newly created OS/2 Shared memory pool.\n");
+	fprintf(stderr, TARGET ": Could not uopen() newly created OS/2 Shared memory pool.\n");
     }
     ap_scoreboard_image = (scoreboard *) m;
     ap_scoreboard_image->global.exit_generation = 0;
@@ -1631,7 +1631,7 @@
 
     m = (caddr_t) get_shared_heap("\\SHAREMEM\\SCOREBOARD");
     if (m == 0) {
-	fprintf(stderr, "httpd: Could not find existing OS/2 Shared memory pool.\n");
+	fprintf(stderr, TARGET ": Could not find existing OS/2 Shared memory pool.\n");
 	exit(APEXIT_INIT);
     }
 
@@ -1682,18 +1682,18 @@
 
     fd = shm_open(ap_scoreboard_fname, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
     if (fd == -1) {
-	perror("httpd: could not open(create) scoreboard");
+	perror(TARGET ": could not open(create) scoreboard");
 	exit(APEXIT_INIT);
     }
     if (ltrunc(fd, (off_t) SCOREBOARD_SIZE, SEEK_SET) == -1) {
-	perror("httpd: could not ltrunc scoreboard");
+	perror(TARGET ": could not ltrunc scoreboard");
 	shm_unlink(ap_scoreboard_fname);
 	exit(APEXIT_INIT);
     }
     if ((m = (caddr_t) mmap((caddr_t) 0,
 			    (size_t) SCOREBOARD_SIZE, PROT_READ | PROT_WRITE,
 			    MAP_SHARED, fd, (off_t) 0)) == (caddr_t) - 1) {
-	perror("httpd: cannot mmap scoreboard");
+	perror(TARGET ": cannot mmap scoreboard");
 	shm_unlink(ap_scoreboard_fname);
 	exit(APEXIT_INIT);
     }
@@ -1738,14 +1738,14 @@
 	int fd = mkstemp(mfile);
 	if (fd == -1) {
 	    perror("open");
-	    fprintf(stderr, "httpd: Could not open %s\n", mfile);
+	    fprintf(stderr, TARGET ": Could not open %s\n", mfile);
 	    exit(APEXIT_INIT);
 	}
 	m = mmap((caddr_t) 0, SCOREBOARD_SIZE,
 		PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
 	if (m == (caddr_t) - 1) {
 	    perror("mmap");
-	    fprintf(stderr, "httpd: Could not mmap %s\n", mfile);
+	    fprintf(stderr, TARGET ": Could not mmap %s\n", mfile);
 	    exit(APEXIT_INIT);
 	}
 	close(fd);
@@ -1757,7 +1757,7 @@
 #endif
     if (m == (caddr_t) - 1) {
 	perror("mmap");
-	fprintf(stderr, "httpd: Could not mmap memory\n");
+	fprintf(stderr, TARGET ": Could not mmap memory\n");
 	exit(APEXIT_INIT);
     }
 #else
@@ -1767,14 +1767,14 @@
     fd = open("/dev/zero", O_RDWR);
     if (fd == -1) {
 	perror("open");
-	fprintf(stderr, "httpd: Could not open /dev/zero\n");
+	fprintf(stderr, TARGET ": Could not open /dev/zero\n");
 	exit(APEXIT_INIT);
     }
     m = mmap((caddr_t) 0, SCOREBOARD_SIZE,
 	     PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
     if (m == (caddr_t) - 1) {
 	perror("mmap");
-	fprintf(stderr, "httpd: Could not mmap /dev/zero\n");
+	fprintf(stderr, TARGET ": Could not mmap /dev/zero\n");
 	exit(APEXIT_INIT);
     }
     close(fd);
@@ -1802,8 +1802,8 @@
 #ifdef LINUX
 	if (errno == ENOSYS) {
 	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, server_conf,
-		    "httpd: Your kernel was built without CONFIG_SYSVIPC\n"
-		    "httpd: please consult the Apache FAQ for details");
+		    TARGET ": Your kernel was built without CONFIG_SYSVIPC\n"
+		    TARGET ": please consult the Apache FAQ for details");
 	}
 #endif
 	ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
@@ -2789,7 +2789,7 @@
 	exit(0);
     else if (x == -1) {
 	perror("fork");
-	fprintf(stderr, "httpd: unable to fork new process\n");
+	fprintf(stderr, TARGET ": unable to fork new process\n");
 	exit(1);
     }
     RAISE_SIGSTOP(DETACH);
@@ -2797,13 +2797,13 @@
 #ifndef NO_SETSID
     if ((pgrp = setsid()) == -1) {
 	perror("setsid");
-	fprintf(stderr, "httpd: setsid failed\n");
+	fprintf(stderr, TARGET ": setsid failed\n");
 	exit(1);
     }
 #elif defined(NEXT) || defined(NEWSOS)
     if (setpgrp(0, getpid()) == -1 || (pgrp = getpgrp(0)) == -1) {
 	perror("setpgrp");
-	fprintf(stderr, "httpd: setpgrp or getpgrp failed\n");
+	fprintf(stderr, TARGET ": setpgrp or getpgrp failed\n");
 	exit(1);
     }
 #elif defined(OS2) || defined(TPF)
@@ -2815,14 +2815,14 @@
 #else
     if ((pgrp = setpgrp(getpid(), 0)) == -1) {
 	perror("setpgrp");
-	fprintf(stderr, "httpd: setpgrp failed\n");
+	fprintf(stderr, TARGET ": setpgrp failed\n");
 	exit(1);
     }
 #endif
 
     /* close out the standard file descriptors */
     if (freopen("/dev/null", "r", stdin) == NULL) {
-	fprintf(stderr, "httpd: unable to replace stdin with /dev/null: %s\n",
+	fprintf(stderr, TARGET ": unable to replace stdin with /dev/null: %s\n",
 		strerror(errno));
 	/* continue anyhow -- note we can't close out descriptor 0 because we
 	 * have nothing to replace it with, and if we didn't have a descriptor
@@ -2831,7 +2831,7 @@
 	 */
     }
     if (freopen("/dev/null", "w", stdout) == NULL) {
-	fprintf(stderr, "httpd: unable to replace stdout with /dev/null: %s\n",
+	fprintf(stderr, TARGET ": unable to replace stdout with /dev/null: %s\n",
 		strerror(errno));
     }
     /* stderr is a tricky one, we really want it to be the error_log,
@@ -4158,7 +4158,7 @@
 	    if (WCOREDUMP(status)) {
 		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
 		    server_conf,
-		    "httpd: child pid %d exit signal %s (%d), "
+		    TARGET ": child pid %d exit signal %s (%d), "
 		    "possible coredump in %s",
 		    pid, (WTERMSIG(status) >= NumSIG) ? "" : 
 		    SYS_SIGLIST[WTERMSIG(status)], WTERMSIG(status),
@@ -4168,7 +4168,7 @@
 #endif
 		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
 		    server_conf,
-		    "httpd: child pid %d exit signal %s (%d)",
+		    TARGET ": child pid %d exit signal %s (%d)",
 		    pid, SYS_SIGLIST[WTERMSIG(status)], WTERMSIG(status));
 #ifdef WCOREDUMP
 	    }
@@ -4176,7 +4176,7 @@
 #else
 	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
 		server_conf,
-		"httpd: child pid %d exit signal %d",
+		TARGET ": child pid %d exit signal %d",
 		pid, WTERMSIG(status));
 #endif
 	}
@@ -4363,12 +4363,12 @@
 		if ( pidfile != NULL && unlink(pidfile) == 0)
 		    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
 				 server_conf,
-				 "httpd: removed PID file %s (pid=%ld)",
+				 TARGET ": removed PID file %s (pid=%ld)",
 				 pidfile, (long)getpid());
 	    }
 
 	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
-			"httpd: caught SIGTERM, shutting down");
+			TARGET ": caught SIGTERM, shutting down");
 	    clean_parent_exit(0);
 	}
 
@@ -5717,7 +5717,7 @@
 	if ( pidfile != NULL && unlink(pidfile) == 0)
 	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
 			 server_conf,
-			 "httpd: removed PID file %s (pid=%ld)",
+			 TARGET ": removed PID file %s (pid=%ld)",
 			 pidfile, (long)getpid());
     }
 
@@ -6005,7 +6005,7 @@
 #endif
 
 #ifndef SHARED_CORE_EXECUTABLE_PROGRAM
-#define SHARED_CORE_EXECUTABLE_PROGRAM "libhttpd.ep"
+#define SHARED_CORE_EXECUTABLE_PROGRAM "lib" TARGET ".ep"
 #endif
 
 extern char *optarg;
@@ -6086,7 +6086,7 @@
      */
     if (execve(prog, argv, envp) == -1) {
 	fprintf(stderr, 
-		"httpd: Unable to exec Shared Core Executable Program `%s'\n",
+		TARGET ": Unable to exec Shared Core Executable Program `%s'\n",
 		prog);
 	return 1;
     }
Index: src/main/util.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/main/util.c,v
retrieving revision 1.140
diff -u -r1.140 util.c
--- src/main/util.c	1998/11/10 03:45:06	1.140
+++ src/main/util.c	1998/12/01 13:50:21
@@ -1535,7 +1535,7 @@
 	return (atoi(&name[1]));
 
     if (!(ent = getpwnam(name))) {
-	fprintf(stderr, "httpd: bad user name %s\n", name);
+	fprintf(stderr, TARGET ": bad user name %s\n", name);
 	exit(1);
     }
     return (ent->pw_uid);
@@ -1553,7 +1553,7 @@
 	return (atoi(&name[1]));
 
     if (!(ent = getgrnam(name))) {
-	fprintf(stderr, "httpd: bad group name %s\n", name);
+	fprintf(stderr, TARGET ": bad group name %s\n", name);
 	exit(1);
     }
     return (ent->gr_gid);
@@ -1644,7 +1644,7 @@
     }
     str[MAXHOSTNAMELEN] = '\0';
     if ((!(p = gethostbyname(str))) || (!(server_hostname = find_fqdn(a, p)))) {
-	fprintf(stderr, "httpd: cannot determine local host name.\n");
+	fprintf(stderr, TARGET ": cannot determine local host name.\n");
 	fprintf(stderr, "Use the ServerName directive to set it manually.\n");
 	exit(1);
     }
Index: src/modules/proxy/proxy_cache.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.52
diff -u -r1.52 proxy_cache.c
--- src/modules/proxy/proxy_cache.c	1998/08/31 19:51:59	1.52
+++ src/modules/proxy/proxy_cache.c	1998/12/01 13:50:24
@@ -227,19 +227,19 @@
 #ifndef NO_SETSID
 		    if ((pgrp = setsid()) == -1) {
 			perror("setsid");
-			fprintf(stderr, "httpd: setsid failed\n");
+			fprintf(stderr, TARGET ": setsid failed\n");
 			exit(1);
 		    }
 #elif defined(NEXT) || defined(NEWSOS)
 		    if (setpgrp(0, getpid()) == -1 || (pgrp = getpgrp(0)) == -1) {
 			perror("setpgrp");
-			fprintf(stderr, "httpd: setpgrp or getpgrp failed\n");
+			fprintf(stderr, TARGET ": setpgrp or getpgrp failed\n");
 			exit(1);
 		    }
 #else
 		    if ((pgrp = setpgrp(getpid(), 0)) == -1) {
 			perror("setpgrp");
-			fprintf(stderr, "httpd: setpgrp failed\n");
+			fprintf(stderr, TARGET ": setpgrp failed\n");
 			exit(1);
 		    }
 #endif
Index: src/modules/standard/mod_include.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.107
diff -u -r1.107 mod_include.c
--- src/modules/standard/mod_include.c	1998/11/30 22:26:49	1.107
+++ src/modules/standard/mod_include.c	1998/12/01 13:50:27
@@ -833,7 +833,7 @@
     fprintf(dbg, "Exec failed\n");
 #endif
     ap_snprintf(err_string, sizeof(err_string),
-                "httpd: exec of %s failed, reason: %s (errno = %d)\n",
+                TARGET ": exec of %s failed, reason: %s (errno = %d)\n",
                 SHELL_PATH, strerror(errno), errno);
     write(STDERR_FILENO, err_string, strlen(err_string));
     exit(0);
@@ -954,7 +954,7 @@
 
     if (ap_allow_options(r) & OPT_INCNOEXEC) {
         ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-                    "httpd: #perl SSI disallowed by IncludesNoExec in %s",
+                    TARGET ": #perl SSI disallowed by IncludesNoExec in %s",
                     r->filename);
         return DECLINED;
     }
@@ -2204,7 +2204,7 @@
             if (!strcmp(directive, "exec")) {
                 if (noexec) {
                     ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-                                "httpd: exec used but not allowed in %s",
+                                TARGET ": exec used but not allowed in %s",
                                 r->filename);
                     if (printing) {
                         ap_rputs(error, r);
@@ -2243,7 +2243,7 @@
 #endif
             else {
                 ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-                            "httpd: unknown directive \"%s\" "
+                            TARGET ": unknown directive \"%s\" "
                             "in parsed doc %s",
                             directive, r->filename);
                 if (printing) {
@@ -2253,7 +2253,7 @@
             }
             if (ret) {
                 ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-                            "httpd: premature EOF in parsed file %s",
+                            TARGET ": premature EOF in parsed file %s",
                             r->filename);
                 return;
             }
Index: src/modules/standard/mod_log_agent.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/modules/standard/mod_log_agent.c,v
retrieving revision 1.30
diff -u -r1.30 mod_log_agent.c
--- src/modules/standard/mod_log_agent.c	1998/08/03 09:15:12	1.30
+++ src/modules/standard/mod_log_agent.c	1998/12/01 13:50:27
@@ -126,7 +126,7 @@
     else if (*cls->fname != '\0') {
         if ((cls->agent_fd = ap_popenf(p, fname, xfer_flags, xfer_mode)) < 0) {
             ap_log_error(APLOG_MARK, APLOG_ERR, s,
-                         "httpd: could not open agent log file %s.", fname);
+                         TARGET ": could not open agent log file %s.", fname);
             exit(1);
         }
     }
Index: src/modules/standard/mod_log_config.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/modules/standard/mod_log_config.c,v
retrieving revision 1.67
diff -u -r1.67 mod_log_config.c
--- src/modules/standard/mod_log_config.c	1998/09/22 09:19:59	1.67
+++ src/modules/standard/mod_log_config.c	1998/12/01 13:50:27
@@ -913,7 +913,7 @@
         char *fname = ap_server_root_relative(p, cls->fname);
         if ((cls->log_fd = ap_popenf(p, fname, xfer_flags, xfer_mode)) < 0) {
             ap_log_error(APLOG_MARK, APLOG_ERR, s,
-                         "httpd: could not open transfer log file %s.", fname);
+                         TARGET ": could not open transfer log file %s.", fname);
             exit(1);
         }
     }
Index: src/modules/standard/mod_log_referer.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/modules/standard/mod_log_referer.c,v
retrieving revision 1.33
diff -u -r1.33 mod_log_referer.c
--- src/modules/standard/mod_log_referer.c	1998/08/03 09:15:13	1.33
+++ src/modules/standard/mod_log_referer.c	1998/12/01 13:50:27
@@ -143,7 +143,7 @@
     else if (*cls->fname != '\0') {
         if ((cls->referer_fd = ap_popenf(p, fname, xfer_flags, xfer_mode)) < 0) {
 	    ap_log_error(APLOG_MARK, APLOG_ERR, s,
-			 "httpd: could not open referer log file %s.", fname);        
+			 TARGET ": could not open referer log file %s.", fname);        
 	    exit(1);
 	}
     }
Index: src/modules/standard/mod_mime.c
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/modules/standard/mod_mime.c,v
retrieving revision 1.45
diff -u -r1.45 mod_mime.c
--- src/modules/standard/mod_mime.c	1998/10/23 19:28:53	1.45
+++ src/modules/standard/mod_mime.c	1998/12/01 13:50:27
@@ -250,7 +250,7 @@
 
     if (!(f = ap_pcfg_openfile(p, types_confname))) {
         ap_log_error(APLOG_MARK, APLOG_ERR, s,
-		     "httpd: could not open mime types log file %s.", types_confname);
+		     TARGET ": could not open mime types log file %s.", types_confname);
         exit(1);
     }
 
Index: src/support/Makefile.tmpl
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/support/Makefile.tmpl,v
retrieving revision 1.26
diff -u -r1.26 Makefile.tmpl
--- src/support/Makefile.tmpl	1998/09/03 18:03:06	1.26
+++ src/support/Makefile.tmpl	1998/12/01 13:59:51
@@ -30,6 +30,7 @@
 
 apxs: apxs.pl
 	sed <apxs.pl >apxs \
+	    -e 's%@TARGET@%$(TARGET)%g' \
 	    -e 's%@CC@%$(CC)%g' \
 	    -e 's%@CFLAGS@%$(CFLAGS)%g' \
 	    -e 's%@CFLAGS_SHLIB@%$(CFLAGS_SHLIB)%g' \
Index: src/support/apxs.pl
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.12
diff -u -r1.12 apxs.pl
--- src/support/apxs.pl	1998/11/19 16:41:12	1.12
+++ src/support/apxs.pl	1998/12/01 13:59:29
@@ -68,6 +68,7 @@
 ##  Configuration
 ##
 
+my $CFG_TARGET        = '@TARGET@';        # substituted via Makefile.tmpl 
 my $CFG_CC            = '@CC@';            # substituted via Makefile.tmpl
 my $CFG_CFLAGS        = '@CFLAGS@';        # substituted via Makefile.tmpl
 my $CFG_CFLAGS_SHLIB  = '@CFLAGS_SHLIB@';  # substituted via Makefile.tmpl
@@ -90,11 +91,11 @@
 ##
 ##  Initial shared object support check
 ##
-if (not grep(/mod_so/, `$CFG_SBINDIR/httpd -l`)) {
+if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -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_TARGET'.\n";
     exit(1);
 }
 
@@ -234,6 +235,7 @@
 
     my $data = join('', <DATA>);
     $data =~ s|%NAME%|$name|sg;
+    $data =~ s|%TARGET%|$CFG_TARGET|sg;
 
     my ($mkf, $src) = ($data =~ m|^(.+)-=#=-\n(.+)|s);
 
@@ -430,17 +432,17 @@
 
     #   activate module via LoadModule/AddModule directive
     if ($opt_a or $opt_A) {
-        if (not -f "$CFG_SYSCONFDIR/httpd.conf") {
-            print "apxs:Error: Config file $CFG_SYSCONFDIR/httpd.conf not found\n";
+        if (not -f "$CFG_SYSCONFDIR/$CFG_TARGET.conf") {
+            print "apxs:Error: Config file $CFG_SYSCONFDIR/$CFG_TARGET.conf not found\n";
             exit(1);
         }
 
-        open(FP, "<$CFG_SYSCONFDIR/httpd.conf") || die;
+        open(FP, "<$CFG_SYSCONFDIR/$CFG_TARGET.conf") || die;
         my $content = join('', <FP>);
         close(FP);
 
         if ($content !~ m|\n#?\s*LoadModule\s+|) {
-            print STDERR "apxs:Error: Activation failed for custom $CFG_SYSCONFDIR/httpd.conf
file.\n";
+            print STDERR "apxs:Error: Activation failed for custom $CFG_SYSCONFDIR/$CFG_TARGET.conf
file.\n";
             print STDERR "apxs:Error: At least one `LoadModule' directive already has to
exist.\n";
             exit(1);
         }
@@ -455,7 +457,7 @@
                  $update = 1;
                  $lmd =~ m|LoadModule\s+(.+?)_module.*|;
                  my $what = $opt_A ? "preparing" : "activating";
-                 print STDERR "[$what module `$1' in $CFG_SYSCONFDIR/httpd.conf]\n";
+                 print STDERR "[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]\n";
             }
         }
         my $amd;
@@ -468,12 +470,12 @@
             }
         }
         if ($update) {
-            open(FP, ">$CFG_SYSCONFDIR/httpd.conf.new") || die;
+            open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new") || die;
             print FP $content;
             close(FP);
-            system("cp $CFG_SYSCONFDIR/httpd.conf $CFG_SYSCONFDIR/httpd.conf.bak &&
" .
-                   "cp $CFG_SYSCONFDIR/httpd.conf.new $CFG_SYSCONFDIR/httpd.conf &&
" .
-                   "rm $CFG_SYSCONFDIR/httpd.conf.new");
+            system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak
&& " .
+                   "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf
&& " .
+                   "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
         }
     }
 }
@@ -537,10 +539,10 @@
 **
 **    $ apxs -c -i mod_%NAME%.c
 **
-**  Then activate it in Apache's httpd.conf file for instance
+**  Then activate it in Apache's %TARGET%.conf file for instance
 **  for the URL /%NAME% in as follows:
 **
-**    #   httpd.conf
+**    #   %TARGET%.conf
 **    LoadModule %NAME%_module libexec/mod_%NAME%.so
 **    <Location /%NAME%>
 **    SetHandler %NAME%

Mime
View raw message