revert the part of the previous commit that removed the install of the
build dir. you can build apache 2 modules again now.
This commit is contained in:
parent
9d0e06ed0d
commit
25265ec03a
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2006/12/25 20:40:02 deanna Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 2007/01/05 22:22:04 dlg Exp $
|
||||
|
||||
COMMENT= "apache HTTP server"
|
||||
|
||||
V= 2.2.3
|
||||
PKGNAME= apache-httpd-${V}p3
|
||||
PKGNAME= apache-httpd-${V}p4
|
||||
DISTNAME= httpd-${V}
|
||||
|
||||
CATEGORIES= www net
|
||||
|
@ -1,17 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2006/12/25 20:40:02 deanna Exp $
|
||||
--- Makefile.in.orig Sun Nov 13 01:33:15 2005
|
||||
+++ Makefile.in Sun Dec 17 00:42:22 2006
|
||||
@@ -15,8 +15,7 @@ PROGRAM_DEPENDENCIES = \
|
||||
PROGRAMS = $(PROGRAM_NAME)
|
||||
TARGETS = $(PROGRAMS) $(shared_build) $(other_targets)
|
||||
INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
|
||||
- install-other install-cgi install-include install-suexec install-build \
|
||||
- install-man
|
||||
+ install-other install-cgi install-include install-suexec install-man
|
||||
|
||||
DISTCLEAN_TARGETS = include/ap_config_auto.h include/ap_config_layout.h \
|
||||
modules.c config.cache config.log config.status build/config_vars.mk \
|
||||
@@ -45,14 +44,18 @@ install-conf:
|
||||
$OpenBSD: patch-Makefile_in,v 1.3 2007/01/05 22:22:04 dlg Exp $
|
||||
--- Makefile.in.orig Sun Nov 13 16:33:15 2005
|
||||
+++ Makefile.in Fri Jan 5 15:05:01 2007
|
||||
@@ -45,14 +45,18 @@ install-conf:
|
||||
( \
|
||||
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
|
||||
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
|
||||
@ -32,7 +22,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2006/12/25 20:40:02 deanna Exp $
|
||||
-e 'p' \
|
||||
< $$i; \
|
||||
for j in $(DSO_MODULES) "^EOL^"; do \
|
||||
@@ -62,8 +65,10 @@ install-conf:
|
||||
@@ -62,8 +66,10 @@ install-conf:
|
||||
done; \
|
||||
sed -e '1,/@@LoadModule@@/d' \
|
||||
-e '/@@LoadModule@@/d' \
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2006/12/25 20:40:02 deanna Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.6 2007/01/05 22:22:04 dlg Exp $
|
||||
@newgroup _apache2:576
|
||||
@newuser _apache2:576:576:daemon:Apache HTTP Server:/var/empty:/sbin/nologin
|
||||
include/apache2/
|
||||
@ -809,6 +809,26 @@ share/doc/apache2/vhosts/name-based.html.ja.euc-jp
|
||||
share/doc/apache2/vhosts/name-based.html.ko.euc-kr
|
||||
share/examples/apache2/
|
||||
@sample /var/apache2/
|
||||
share/examples/apache2/build/
|
||||
@sample /var/apache2/build/
|
||||
share/examples/apache2/build/config.nice
|
||||
@sample /var/apache2/build/config.nice
|
||||
share/examples/apache2/build/config_vars.mk
|
||||
@sample /var/apache2/build/config_vars.mk
|
||||
share/examples/apache2/build/instdso.sh
|
||||
@sample /var/apache2/build/instdso.sh
|
||||
share/examples/apache2/build/library.mk
|
||||
@sample /var/apache2/build/library.mk
|
||||
share/examples/apache2/build/ltlib.mk
|
||||
@sample /var/apache2/build/ltlib.mk
|
||||
share/examples/apache2/build/mkdir.sh
|
||||
@sample /var/apache2/build/mkdir.sh
|
||||
share/examples/apache2/build/program.mk
|
||||
@sample /var/apache2/build/program.mk
|
||||
share/examples/apache2/build/rules.mk
|
||||
@sample /var/apache2/build/rules.mk
|
||||
share/examples/apache2/build/special.mk
|
||||
@sample /var/apache2/build/special.mk
|
||||
share/examples/apache2/cgi-bin/
|
||||
@sample /var/apache2/cgi-bin/
|
||||
share/examples/apache2/cgi-bin/printenv
|
||||
|
Loading…
x
Reference in New Issue
Block a user