diff options
| -rw-r--r-- | usr.sbin/httpd/Makefile.bsd-wrapper | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper index 0aab4ce5188..9420cd77199 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.21 2001/03/29 10:21:22 beck Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.22 2001/04/13 19:01:55 beck Exp $ # Our lndir is hacked; specify a full path to avoid potential conflicts # with the one installed with X11. @@ -142,6 +142,7 @@ MUNGEDFILES = ${.OBJDIR}/src/ap/Makefile \ ${.OBJDIR}/src/modules.c \ ${.OBJDIR}/src/Configuration.apaci ${.OBJDIR}/Makefile \ ${.OBJDIR}/config.status + BINFILES= src/support/htdigest src/support/htpasswd SBINFILES= \ @@ -524,18 +525,19 @@ ICONFILES= \ all: prereq @cd ${.OBJDIR} && ${MAKE} -prereq: ${.OBJDIR}/config.status +prereq: ${.OBJDIR}/config.status -${.OBJDIR}/config.status : ${.OBJDIR}/config.layout +${.OBJDIR}/config.status : ${.OBJDIR}/config.layout @cd ${.OBJDIR} && CC="${CC}" LD_SHLIB="${CC}" OPTIM="${CFLAGS}" \ PATH="/sbin:/usr/sbin:/bin:/usr/bin" \ sh configure ${CONFIG_ARGS} .if !exists(${.OBJDIR}/config.layout) ${.OBJDIR}/config.layout: ${.CURDIR}/config.layout - @${LNDIR} -s -e obj -e obj.${MACHINE_ARCH} -e Makefile.bsd-wrapper ${.CURDIR} + ${LNDIR} -s -e obj -e obj.${MACHINE_ARCH} -e Makefile.bsd-wrapper ${.CURDIR} .endif + includes: prereq @-for i in ${INCFILES}; do \ j=`basename $$i`; \ @@ -598,12 +600,16 @@ install: maninstall echo $$j; \ eval $$j; \ rm -rf $$d - + +.if ${.OBJDIR} == ${.CURDIR} clean: prereq - @cd ${.OBJDIR} && ${MAKE} clean + @cd ${.OBJDIR} && ${MAKE} clean && rm -f ${MUNGEDFILES} +.else +clean: + @cd ${.OBJDIR} && find . \! -type d -print | xargs rm +.endif cleandir: clean - @cd ${.OBJDIR} && rm -f ${MUNGEDFILES} test: # Nothing here so far... |