diff options
| author | joerg <joerg@pkgsrc.org> | 2014-12-12 10:50:17 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-12-12 10:50:17 +0000 |
| commit | 88a35d883ba8a69356ce27c3ddb20519ff83bdd7 (patch) | |
| tree | a66e5f5f49f23ad69c73809a1b9ec81ccfbe704b /mk | |
| parent | 5ad35d21496e5dcb27036761e2007c3c7ebd6f7f (diff) | |
| download | pkgsrc-88a35d883ba8a69356ce27c3ddb20519ff83bdd7.tar.gz | |
Use append for IMAKEOPTS and the real path for exec as IMAKE includes
the options.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cwrappers.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/cwrappers.mk b/mk/cwrappers.mk index ddec3d28347..e568d11f8f0 100644 --- a/mk/cwrappers.mk +++ b/mk/cwrappers.mk @@ -1,4 +1,4 @@ -# $NetBSD: cwrappers.mk,v 1.19 2014/12/12 10:12:50 joerg Exp $ +# $NetBSD: cwrappers.mk,v 1.20 2014/12/12 10:50:17 joerg Exp $ # # This Makefile fragment implements integration of pkgtools/cwrappers. @@ -40,7 +40,7 @@ CWRAPPERS_WRAPPEE.cxx= ${PKG_CXX:Ufalse} CWRAPPERS_WRAPPEE.cc= ${PKG_CC:Ufalse} CWRAPPERS_WRAPPEE.cpp= ${PKG_CPP:Ufalse} CWRAPPERS_WRAPPEE.f77= ${PKG_FC:Ufalse} -CWRAPPERS_WRAPPEE.imake= ${IMAKE:Ufalse} +CWRAPPERS_WRAPPEE.imake= ${TOOLS_PATH.imake:Ufalse} CWRAPPERS_WRAPPEE.ld= ${LD:Ufalse} CWRAPPERS_WRAPPEE.libtool= ${PKG_LIBTOOL:Ufalse} CWRAPPERS_WRAPPEE.shlibtool= ${PKG_SHLIBTOOL:Ufalse} @@ -52,6 +52,7 @@ CWRAPPERS_APPEND.cpp+= -I${PREFIX}/include .if defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake) CWRAPPERS_TRANSFORM.imake+= I:${PREFIX}/lib/X11/config:${PREFIX}/lib/X11/config +CWRAPPERS_APPEND.imake+= ${IMAKEOPTS} .endif .PHONY: generate-cwrappers |