[pkgsrc/trunk]: pkgsrc/mk Use append for IMAKEOPTS and the real path for exec...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83ad7139bb58
branches:  trunk
changeset: 643181:83ad7139bb58
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Dec 12 10:50:17 2014 +0000

description:
Use append for IMAKEOPTS and the real path for exec as IMAKE includes
the options.

diffstat:

 mk/cwrappers.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r ee9702d51a54 -r 83ad7139bb58 mk/cwrappers.mk
--- a/mk/cwrappers.mk   Fri Dec 12 10:12:50 2014 +0000
+++ b/mk/cwrappers.mk   Fri Dec 12 10:50:17 2014 +0000
@@ -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.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 @@
 
 .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