Commit 9cf96e9c authored by Mike Hibler's avatar Mike Hibler
Browse files

A config file directory for Apache 2.4.

Currently these are just copies of the 2.2 file, but I am anticipating changes.
parent 5471384d
# #
# Copyright (c) 2002-2015 University of Utah and the Flux Group. # Copyright (c) 2002-2017 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -47,9 +47,11 @@ CONFIG_GENI = httpd-geni.conf ...@@ -47,9 +47,11 @@ CONFIG_GENI = httpd-geni.conf
CONFIG_FILES += $(CONFIG_GENI) CONFIG_FILES += $(CONFIG_GENI)
endif endif
# ifeq ($(APACHE_VERSION),24)
# Move to Apache 22 ... # For VPATH.
# MOSTLY_SRCDIRS = ${SRCDIR}/v24
SCRIPT_HACK = 0
else
ifeq ($(APACHE_VERSION),22) ifeq ($(APACHE_VERSION),22)
# For VPATH. # For VPATH.
MOSTLY_SRCDIRS = ${SRCDIR}/v2 MOSTLY_SRCDIRS = ${SRCDIR}/v2
...@@ -57,6 +59,7 @@ SCRIPT_HACK = 0 ...@@ -57,6 +59,7 @@ SCRIPT_HACK = 0
else else
MOSTLY_SRCDIRS = ${SRCDIR}/v1 MOSTLY_SRCDIRS = ${SRCDIR}/v1
endif endif
endif
INSTALL_PHP_CONFIG = /usr/local/etc INSTALL_PHP_CONFIG = /usr/local/etc
# #
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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