diff options
| author | jlam <jlam@pkgsrc.org> | 2001-12-26 19:18:40 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-12-26 19:18:40 +0000 |
| commit | d3009b7413cce20a91e41095c08ddcdf8d4c59d7 (patch) | |
| tree | d18dc4366b1aed9d68ac3451fbdeb86734a59e51 /mk | |
| parent | e023ba19952dc2bc091ced093577d8edd5116b60 (diff) | |
| download | pkgsrc-d3009b7413cce20a91e41095c08ddcdf8d4c59d7.tar.gz | |
Remove excessively clever checks to allow a section to be seen only if it's
the second time this file is included. Check for BSD_PREFS_MK instead.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pthread.buildlink.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/mk/pthread.buildlink.mk b/mk/pthread.buildlink.mk index 3fad1d66579..9b3fa857d41 100644 --- a/mk/pthread.buildlink.mk +++ b/mk/pthread.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: pthread.buildlink.mk,v 1.1 2001/12/24 19:29:32 jlam Exp $ +# $NetBSD: pthread.buildlink.mk,v 1.2 2001/12/26 19:18:40 jlam Exp $ # # This Makefile fragment is included by packages that use pthreads. # This Makefile fragment is also included directly by bsd.prefs.mk. @@ -57,17 +57,14 @@ PTHREAD_TYPE?= ${_PKG_PTHREAD_TYPE} # ########################################################################### # -# Only allow the following section to be seen _after_ the first time this -# file is included. This allows this file to be included by bsd.prefs.mk +# Only allow the following section to be seen if this file isn't included +# from bsd.prefs.mk. This allows this file to be included by bsd.prefs.mk # and also to be included in a package Makefile as is done normally, and # allows us to consolidate the pthread Makefile logic in one place. We # want this, as we'd like for PTHREAD_TYPE to be available to package # Makefiles after they pull in bsd.prefs.mk. # -_PTHREAD_BUILDLINK_MK_NPASSES?= # empty -_PTHREAD_BUILDLINK_MK_NPASSES:= ${_PTHREAD_BUILDLINK_MK_NPASSES}. - -.if !empty(_PTHREAD_BUILDLINK_MK_NPASSES:M..) +.if !defined(BSD_PREFS_MK) .if !defined(PTHREAD_BUILDLINK_MK) PTHREAD_BUILDLINK_MK= # defined @@ -102,4 +99,4 @@ DEPENDS+= unproven-threads>=0.17:../../devel/unproven-pthreads .endif .endif # PTHREAD_BUILDLINK_MK -.endif # _PTHREAD_BUILDLINK_MK_NPASSES +.endif # BSD_PREFS_MK |