diff options
Diffstat (limited to 'www/apache6/Makefile')
| -rw-r--r-- | www/apache6/Makefile | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 09e9f96b88c..15a271b86d6 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2001/11/23 10:52:21 martti Exp $ +# $NetBSD: Makefile,v 1.46 2001/11/25 18:59:48 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -46,9 +46,7 @@ BUILD_DEFS+= USE_INET6 IGNORE= "IPv6 only build" .endif -APACHE_SYSCONFDIR?= ${CONFDIR}/httpd -BUILD_DEFS+= APACHE_SYSCONFDIR -FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} +PKG_SYSCONFSUBDIR?= httpd .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES APACHE_USER?= www @@ -106,12 +104,11 @@ BUILD_DEFS+= APACHE_SUEXEC EGDIR= ${PREFIX}/share/examples/httpd -CONF_FILES= ${EGDIR}/httpd.conf.default ${APACHE_SYSCONFDIR}/httpd.conf -SUPPORT_FILES= ${EGDIR}/magic.default ${APACHE_SYSCONFDIR}/magic -SUPPORT_FILES+= ${EGDIR}/mime.types.default ${APACHE_SYSCONFDIR}/mime.types +CONF_FILES= ${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf +SUPPORT_FILES= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic +SUPPORT_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types RCD_SCRIPTS= apache -MAKE_DIRS= ${APACHE_SYSCONFDIR} OWN_DIRS= /var/log/httpd OWN_DIRS+= /var/spool/httpd OWN_DIRS_PERMS+= /var/spool/httpd/proxy nobody nobody 0755 @@ -151,9 +148,9 @@ post-install: .endif ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd for file in httpd.conf magic mime.types; do \ - ${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$${file}.default \ + ${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default \ ${PREFIX}/share/examples/httpd; \ - ${RM} -f ${APACHE_SYSCONFDIR}/$${file}.default; \ + ${RM} -f ${PKG_SYSCONFDIR}/$${file}.default; \ done ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache |