equal
deleted
inserted
replaced
16 # fields enclosed by brackets "[]" replaced with your own identifying |
16 # fields enclosed by brackets "[]" replaced with your own identifying |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 # Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
21 # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. |
22 # |
22 # |
23 |
23 |
24 APACHE_22_USR_PREFIX=/usr/apache2/2.2 |
24 APACHE_22_USR_PREFIX=/usr/apache2/2.2 |
25 APACHE_24_USR_PREFIX=/usr/apache2/2.4 |
25 APACHE_24_USR_PREFIX=/usr/apache2/2.4 |
26 |
26 |
74 |
74 |
75 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin |
75 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin |
76 ifeq ($(strip $(PARFAIT_BUILD)),yes) |
76 ifeq ($(strip $(PARFAIT_BUILD)),yes) |
77 PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin |
77 PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin |
78 endif |
78 endif |
|
79 |
|
80 REQUIRED_PACKAGES += web/server/apache-22 |
|
81 REQUIRED_PACKAGES += web/server/apache-24 |