diff options
| author | rillig <rillig> | 2006-08-30 06:16:27 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-08-30 06:16:27 +0000 |
| commit | c9d4146529ed249f094bd8ef6f4289f0e6ded149 (patch) | |
| tree | 94ad76613e59bc9d390f92a1f242e3ace9597b6d /www/apache2/Makefile | |
| parent | 2d633fd836c96dcede9e9f6e4c393c33f54f35a2 (diff) | |
| download | pkgsrc-c9d4146529ed249f094bd8ef6f4289f0e6ded149.tar.gz | |
The directories for configuration files and log files are now set in the
config.layout file instead of CONFIGURE_ARGS, to avoid defining things
twice. No actual change, since the paths are still the same.
Added all necessary variables to BUILD_DEFS, as reported by pkglint.
Diffstat (limited to 'www/apache2/Makefile')
| -rw-r--r-- | www/apache2/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 0c7c69cd9a4..53074f386df 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2006/07/28 13:35:37 tron Exp $ +# $NetBSD: Makefile,v 1.105 2006/08/30 06:16:27 rillig Exp $ .include "Makefile.common" @@ -12,13 +12,12 @@ COMMENT= Apache HTTP (Web) server, version 2 CONFLICTS= apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]* BUILD_DEFS+= USE_INET6 +BUILD_DEFS+= VARBASE USE_TOOLS+= perl perl:run pkg-config USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-layout=NetBSD -CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ARGS+= --enable-so CONFIGURE_ENV+= perlbin=${PERL5:Q} @@ -94,6 +93,7 @@ APACHE_USER?= www APACHE_GROUP?= www PKG_GROUPS= ${APACHE_GROUP} PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} +BUILD_DEFS+= APACHE_USER APACHE_GROUP PKG_SYSCONFVAR= apache PKG_SYSCONFSUBDIR?= httpd @@ -130,6 +130,8 @@ SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= config.layout SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_SED.paths+= -e "s|@VARBASE@|${VARBASE}|g" +SUBST_SED.paths+= -e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g" SUBST_MESSAGE.paths= Fixing paths. SUBST_CLASSES+= apr-lt |