summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2007-02-19 14:50:21 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2007-02-19 14:50:21 +0000
commit9dacaa0ad07f5e4068060bb96085be9e1bd2729b (patch)
treeb13449303301d38090773cd37cfd967920abed9f /usr.sbin
parentbb417499a2944ee13186adbb7cb3f96c13ffe434 (diff)
unbreak by allowing clean in !objdir case to fail (no Makefile there in that
case), ok espie, also noticed by simon
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/httpd/Makefile.bsd-wrapper6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index f397f88256d..95d33ee620b 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.60 2007/02/13 00:37:24 espie Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.61 2007/02/19 14:50:20 henning Exp $
# Our lndir is hacked; specify a full path to avoid potential conflicts
# with the one installed with X11.
@@ -703,8 +703,8 @@ install: maninstall
.if ${.OBJDIR} == ${.CURDIR}
clean: cleanman
- @cd ${.OBJDIR} && ${MAKE} clean && rm -f ${MUNGEDFILES}
-.else
+ -@cd ${.OBJDIR} && rm -f ${MUNGEDFILES} && ${MAKE} clean
+.else
clean: cleanman
@cd ${.OBJDIR} && find . \! -type d -print0 | xargs -0r rm
.endif