randy 99/05/02 07:40:36
Modified: . Makefile.tmpl Log: Reverse previous commit. NOTICE: attempt to abort previous commit failed with cvs continuing to commit changes despite a quite from the editory. Revision Changes Path 1.79 +1 -4 apache-1.3/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- Makefile.tmpl 1999/05/02 14:37:06 1.78 +++ Makefile.tmpl 1999/05/02 14:40:36 1.79 @@ -384,10 +384,7 @@ 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)/$${apachectl}; \ + $(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl $(root)$(sbindir)/$${apachectl}; \ echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8"; \ $(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8 $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/htpasswd $(root)$(bindir)/htpasswd