summaryrefslogtreecommitdiff
path: root/usr.sbin/httpd/Makefile.bsd-wrapper
diff options
context:
space:
mode:
authorRobert Nagy <robert@cvs.openbsd.org>2007-10-30 17:49:51 +0000
committerRobert Nagy <robert@cvs.openbsd.org>2007-10-30 17:49:51 +0000
commitf8c5f346273aca4f6c3888571e022aaad9ce17bc (patch)
tree8ef7f326b7370c02386d1316ef2320d19f7f78c9 /usr.sbin/httpd/Makefile.bsd-wrapper
parente3f9b60fc1c525b1d33f828014aa6227c1377d1e (diff)
Add two module configuration directories named modules and modules.sample
and include *.conf files from the modules directory by default. The modules.sample directory will be used by some ports to place their configuration files. ok deraadt@, jsign@
Diffstat (limited to 'usr.sbin/httpd/Makefile.bsd-wrapper')
-rw-r--r--usr.sbin/httpd/Makefile.bsd-wrapper10
1 files changed, 9 insertions, 1 deletions
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index 95d33ee620b..c7caae04390 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
# Build wrapper for Apache
-# $OpenBSD: Makefile.bsd-wrapper,v 1.61 2007/02/19 14:50:20 henning Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.62 2007/10/30 17:49:50 robert Exp $
# Our lndir is hacked; specify a full path to avoid potential conflicts
# with the one installed with X11.
@@ -219,6 +219,10 @@ XMLFILES= \
src/lib/expat-lite/xmltok.h \
src/lib/expat-lite/xmltok_impl.h
+MODCONFDIR= \
+ modules \
+ modules.sample
+
CONFFILES= \
conf/httpd.conf-dist conf/httpd.conf \
conf/mime.types conf/magic
@@ -734,6 +738,10 @@ cleanman:
.endif
distribution:
+ @-for i in ${MODCONFDIR}; do \
+ echo "Installing ${DESTDIR}${HTTPD_SYSCONFDIR}/$$i"; \
+ ${INSTALL} -d -m 755 ${DESTDIR}${HTTPD_SYSCONFDIR}/$$i; \
+ done
@-for i in ${CONFFILES}; do \
j=`dirname $$i`; \
echo "Installing ${DESTDIR}${HTTPD_PREFIX}/$$i"; \