diff options
| author | abs <abs@pkgsrc.org> | 2007-01-04 13:42:39 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2007-01-04 13:42:39 +0000 |
| commit | 32e93b479fec7ede650abec46e9e00a4009b9128 (patch) | |
| tree | 3cea566e7061e490215fcc7d3746c71154cc74e5 /www | |
| parent | b4d7292b296b4724db67c5ff010fdcdd4277a0df (diff) | |
| download | pkgsrc-32e93b479fec7ede650abec46e9e00a4009b9128.tar.gz | |
Update apache22 to apache-2.2.3nb1
abs_srcdir in config_vars.mk is used during install so needs to reference
the work dir path, and by other packages such as ap2-fastcgi after install,
so we fix after install to reference the installed path
- Fixes ap2-fastcgi build
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache22/Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index cd8ddca3c20..4cde258c4ab 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2007/01/04 13:22:06 obache Exp $ +# $NetBSD: Makefile,v 1.4 2007/01/04 13:42:39 abs Exp $ .include "Makefile.common" PKGNAME= apache-${APACHE_VERSION} -#PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= www HOMEPAGE= http://httpd.apache.org/ @@ -169,6 +169,15 @@ SUBST_SED.confs+= -e 's|/var/log/httpd/foo\.log|logs/foo.log/|g' SUBST_SED.confs+= -e 's|^\(User[ ]\).*|\1${APACHE_USER}|g' SUBST_SED.confs+= -e 's|^\(Group[ ]\).*|\1${APACHE_GROUP}|g' +# abs_srcdir in config_vars.mk is used during install so needs to reference +# the work dir path, and by other packages such as ap2-fastcgi after install, +# so we fix after install to reference the installed path +SUBST_CLASSES+= abs_srcdir +SUBST_STAGE.abs_srcdir= post-install +SUBST_FILES.abs_srcdir= ${PREFIX}/share/httpd/build/config_vars.mk +SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|' +SUBST_MESSAGE.abs_srcdir= Fixing abs_srcdir + .include "options.mk" # Add dependencies for the modules that will be built. For each module |