summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.subdir.mk
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>1998-06-17 21:01:09 +0000
committerhubertf <hubertf@pkgsrc.org>1998-06-17 21:01:09 +0000
commit3f24a982fcbc60d559a23dc75efb4682789ce218 (patch)
tree8c7fccc955813a736d518b4ccc374efb1fc26276 /mk/bsd.pkg.subdir.mk
parenta45d3c586bdb2d5b7fe9e41f05a88a460ae806fe (diff)
downloadpkgsrc-3f24a982fcbc60d559a23dc75efb4682789ce218.tar.gz
Do not abort compilation of several packages if building a single package
fails. (Doing this via a "make -k" breaks things like dependent pkgs in a nasty way)
Diffstat (limited to 'mk/bsd.pkg.subdir.mk')
-rw-r--r--mk/bsd.pkg.subdir.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk
index 2184cc18a7c..c4e71d46935 100644
--- a/mk/bsd.pkg.subdir.mk
+++ b/mk/bsd.pkg.subdir.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.subdir.mk,v 1.16 1998/05/29 03:25:51 hubertf Exp $
+# $NetBSD: bsd.pkg.subdir.mk,v 1.17 1998/06/17 21:01:09 hubertf Exp $
# Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
#
@@ -65,10 +65,16 @@ _SUBDIRUSE: .USE
${ECHO_MSG} "===> ${_THISDIR_}$${entry} non-existent"; \
fi; \
if [ "$$OK" = "" ]; then \
- ${ECHO_MSG} "===> ${_THISDIR_}$${edir}"; \
cd ${.CURDIR}/$${edir}; \
- ${MAKE} ${.TARGET:realinstall=install} \
- "_THISDIR_=${_THISDIR_}$${edir}/"; \
+ if [ -z "${_THISDIR_}" ]; then \
+ ${ECHO_MSG} "===> category ${_THISDIR_}$${edir}"; \
+ ${MAKE} ${.TARGET:realinstall=install} \
+ "_THISDIR_=${_THISDIR_}$${edir}/"; \
+ else \
+ ${ECHO_MSG} "===> package ${_THISDIR_}$${edir}"; \
+ ${MAKE} ${.TARGET:realinstall=install} \
+ "_THISDIR_=${_THISDIR_}$${edir}/" || /usr/bin/true ; \
+ fi ; \
fi; \
done