diff options
| author | jlam <jlam> | 2002-09-03 03:14:10 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-09-03 03:14:10 +0000 |
| commit | c051875d25d9ea190bb04358f213fa42e6a92919 (patch) | |
| tree | 67314ed41af9a1fd6e81dab92804cf152301274f /mk | |
| parent | 64b3eb93328ae122d27db6f3cd67926871f4e682 (diff) | |
| download | pkgsrc-c051875d25d9ea190bb04358f213fa42e6a92919.tar.gz | |
Don't munge references to directories in ${ZOULARISBASE} if
${ZOULARISBASE} != ${LOCALBASE}. This should fix problems compiling
pkgtools/digest with zoularis where ${ZOULARISBASE} != ${LOCALBASE}.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 2b3aa1aefa6..adfc556d2ad 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.9 2002/09/02 21:53:23 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.10 2002/09/03 03:14:10 jlam Exp $ # # An example package buildlink2.mk file: # @@ -581,6 +581,12 @@ ${_BLNK_WRAP_PRE_CACHE}: ${.CURDIR}/../../mk/buildlink2/pre-cache -e "s|@BUILDLINK_X11_DIR@|${BUILDLINK_X11_DIR}|g" \ -e "s|@BUILDLINK_X11PKG_DIR@|${BUILDLINK_X11PKG_DIR}|g" \ ${.ALLSRC} > ${.TARGET}.tmp +.if defined(ZOULARISBASE) && (${ZOULARISBASE} != ${LOCALBASE}) + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} \ + "-I${ZOULARISBASE}/*)" >> ${.TARGET}.tmp + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} \ + " ;;" >> ${.TARGET}.tmp +.endif ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET} ${_BLNK_WRAP_POST_CACHE}: ${.CURDIR}/../../mk/buildlink2/post-cache |