From 3268be98b93e31abc0e83b7651012ccc7e69b256 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 26 Nov 2001 07:30:44 +0000 Subject: Forgot a CONFDIR -> PKG_SYSCONFDIR replacement. --- www/apache/files/apache.sh | 6 +++--- www/apache/files/config.layout | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'www/apache/files') diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh index 5e159a4b62f..3bd20dd9e7e 100644 --- a/www/apache/files/apache.sh +++ b/www/apache/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.13 2001/05/14 21:27:25 jlam Exp $ +# $NetBSD: apache.sh,v 1.14 2001/11/26 07:34:06 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON @@ -14,10 +14,10 @@ rcvar=$name command="@PREFIX@/sbin/apachectl" apache_start=start -if [ -f @APACHE_SYSCONFDIR@/apache_start.conf ] +if [ -f @PKG_SYSCONFDIR@/apache_start.conf ] then # This file can reset apache_start to "startssl" - . @APACHE_SYSCONFDIR@/apache_start.conf + . @PKG_SYSCONFDIR@/apache_start.conf fi # set defaults diff --git a/www/apache/files/config.layout b/www/apache/files/config.layout index 81d1cbe443a..0208f9c3a00 100644 --- a/www/apache/files/config.layout +++ b/www/apache/files/config.layout @@ -1,4 +1,4 @@ -# $NetBSD: config.layout,v 1.3 2001/10/17 19:17:00 jlam Exp $ +# $NetBSD: config.layout,v 1.4 2001/11/26 07:34:06 jlam Exp $ prefix: @PREFIX@ @@ -7,7 +7,7 @@ bindir: ${exec_prefix}/bin sbindir: ${exec_prefix}/sbin libexecdir: ${exec_prefix}/lib/httpd mandir: ${prefix}/man -sysconfdir: @APACHE_SYSCONFDIR@ +sysconfdir: @PKG_SYSCONFDIR@ datadir: ${prefix}/share/httpd iconsdir: ${prefix}/share/httpd/icons htdocsdir: ${prefix}/share/httpd/htdocs -- cgit v1.2.3