Commit 9771e08e authored by Mike Hibler's avatar Mike Hibler

Another apache 2.4 fix.

parent a675b0dd
...@@ -143,7 +143,13 @@ ifeq ($(SCRIPT_HACK),1) ...@@ -143,7 +143,13 @@ ifeq ($(SCRIPT_HACK),1)
$(INSTALL) -m 755 $(SRCDIR)/apache-emulab /usr/local/etc/rc.d/apache.sh $(INSTALL) -m 755 $(SRCDIR)/apache-emulab /usr/local/etc/rc.d/apache.sh
endif endif
ifeq ($(APACHE_VERSION),22) ifeq ($(APACHE_VERSION),1.3)
install: install-dirs install-scripts httpd.conf.fixed
$(INSTALL_DATA) httpd.conf.fixed $(INSTALL_APACHE_CONFIG)/httpd.conf
control-install: install-dirs install-scripts httpd.conf-ops.fixed
$(INSTALL_DATA) httpd.conf-ops.fixed $(INSTALL_APACHE_CONFIG)/httpd.conf
else
install: install-dirs install-scripts httpd.conf pgeni-install install: install-dirs install-scripts httpd.conf pgeni-install
$(INSTALL_DATA) httpd.conf $(INSTALL_APACHE_CONFIG)/httpd.conf $(INSTALL_DATA) httpd.conf $(INSTALL_APACHE_CONFIG)/httpd.conf
...@@ -156,12 +162,6 @@ ifeq ($(PGENISUPPORT),1) ...@@ -156,12 +162,6 @@ ifeq ($(PGENISUPPORT),1)
endif endif
utah: httpd.conf.utah httpd.conf-ops.utah utah: httpd.conf.utah httpd.conf-ops.utah
else
install: install-dirs install-scripts httpd.conf.fixed
$(INSTALL_DATA) httpd.conf.fixed $(INSTALL_APACHE_CONFIG)/httpd.conf
control-install: install-dirs install-scripts httpd.conf-ops.fixed
$(INSTALL_DATA) httpd.conf-ops.fixed $(INSTALL_APACHE_CONFIG)/httpd.conf
endif endif
install-php-ini: php.ini install-php-ini: php.ini
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment