httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@hyperreal.org
Subject cvs commit: apache-1.3 Makefile.tmpl
Date Sat, 05 Dec 1998 21:10:41 GMT
randy       98/12/05 13:10:41

  Modified:    .        Makefile.tmpl
  Log:
  Modify behavior of configure when TARGET is default. Old behavior is
  maintained where the log files and startup script are concerned.
  ie. apachectl, access_log, error_log.
  
  Revision  Changes    Path
  1.53      +24 -8     apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- Makefile.tmpl	1998/12/05 11:13:44	1.52
  +++ Makefile.tmpl	1998/12/05 21:10:40	1.53
  @@ -198,6 +198,11 @@
   	-@$(RM) $(SRC)/.apaci.install.tmp
   	-@$(RM) $(SRC)/.apaci.install.conf
   	-@if [ ".$(QUIET)" != .1 ]; then \
  +		if [ ".$(TARGET)" = .httpd ]; then \
  +			apachectl='apachectl'; \
  +		else \
  +			apachectl="$(TARGET)ctl"; \
  +		fi; \
   		echo "+--------------------------------------------------------+"; \
   		echo "| You now have successfully built and installed the      |"; \
   		echo "| Apache 1.3 HTTP server. To verify that Apache actually |"; \
  @@ -209,7 +214,7 @@
   		echo "| and then you should be able to immediately fire up     |"; \
   		echo "| Apache the first time by running:                      |"; \
   		echo "|                                                        |"; \
  -		echo "|   $(sbindir)/$(TARGET)ctl start"; \
  +		echo "|   $(sbindir)/$${apachectl} start"; \
   		echo "|                                                        |"; \
   		echo "| Thanks for using Apache.       The Apache Group        |"; \
   		echo "|                                http://www.apache.org/  |"; \
  @@ -290,12 +295,18 @@
   	@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)/$(TARGET)ctl";
\
  +	@if [ ".$(TARGET)" = .httpd ]; then \
  +		apachectl='apachectl'; \
  +	else \
  +		apachectl="$(TARGET)ctl"; \
  +	fi; \
  +	echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}";
\
   	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)/$(TARGET)ctl
  -	$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/$(TARGET)ctl.1
  +		$(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \
  +	echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.1 $(root)$(mandir)/man1/$${apachectl}.1";
\
  +	$(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
  @@ -382,6 +393,11 @@
   		else \
   			target_conf="$$conf"; \
   		fi; \
  +		if [ ".$(TARGET)" = .httpd ]; then \
  +			target_prefix=""; \
  +		else \
  +			target_prefix="$(TARGET)_"; \
  +		fi; \
   		(echo "##"; \
   		 echo "## $${conf} -- Apache HTTP server configuration file"; \
   		 echo "##"; \
  @@ -396,10 +412,10 @@
   			-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)/$(TARGET)-access_log;' \
  -			-e 's;logs/error_log;$(logfiledir)/$(TARGET)-error_log;' \
  -			-e 's;logs/referer_log;$(logfiledir)/$(TARGET)-referer_log;' \
  -			-e 's;logs/agent_log;$(logfiledir)/$(TARGET)-agent_log;' \
  +			-e 's;logs/access_log;$(logfiledir)/$${target_prefix}access_log;' \
  +			-e 's;logs/error_log;$(logfiledir)/$${target_prefix}error_log;' \
  +			-e 's;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;' \
  +			-e 's;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;' \
   			-e 's;conf/magic;$(sysconfdir)/magic;' \
   			-e 's;conf/mime.types;$(sysconfdir)/mime.types;' \
   			-e 's;Group #-1;Group $(conf_group);' \
  
  
  

Mime
View raw message