diff options
| author | jlam <jlam> | 2001-11-26 07:30:44 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-11-26 07:30:44 +0000 |
| commit | 3268be98b93e31abc0e83b7651012ccc7e69b256 (patch) | |
| tree | ce964d0907326e2bc74bee9012da993ab49a30bf /www/apache6 | |
| parent | 8b39a72c1fba17e89f234c889c5aaeaf9c7f568c (diff) | |
| download | pkgsrc-3268be98b93e31abc0e83b7651012ccc7e69b256.tar.gz | |
Forgot a CONFDIR -> PKG_SYSCONFDIR replacement.
Diffstat (limited to 'www/apache6')
| -rw-r--r-- | www/apache6/files/apache.sh | 6 | ||||
| -rw-r--r-- | www/apache6/files/config.layout | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh index 3f8f7bcd242..d8a2a50c68c 100644 --- a/www/apache6/files/apache.sh +++ b/www/apache6/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.9 2001/05/14 21:28:33 jlam Exp $ +# $NetBSD: apache.sh,v 1.10 2001/11/26 07:34:07 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/apache6/files/config.layout b/www/apache6/files/config.layout index f86938090c0..620a76245b0 100644 --- a/www/apache6/files/config.layout +++ b/www/apache6/files/config.layout @@ -1,4 +1,4 @@ -# $NetBSD: config.layout,v 1.2 2001/10/17 07:47:53 martti Exp $ +# $NetBSD: config.layout,v 1.3 2001/11/26 07:34:07 jlam Exp $ <Layout pkgsrc> 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 |