diff options
| author | joerg <joerg@pkgsrc.org> | 2014-11-27 20:33:32 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-11-27 20:33:32 +0000 |
| commit | c2c47ce92ce399aeb961a3f0bbdc7b325853dc30 (patch) | |
| tree | 19a28a4e0f2e87780c1c4b74ce767b5a420c926a /mk | |
| parent | 236c97c6eb33c2cab01b529aefd2bdbbd7908785 (diff) | |
| download | pkgsrc-c2c47ce92ce399aeb961a3f0bbdc7b325853dc30.tar.gz | |
Support wrappee specific transformations and use it to fix imake.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cwrappers.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/cwrappers.mk b/mk/cwrappers.mk index 854b3f644eb..4e3492c2d2a 100644 --- a/mk/cwrappers.mk +++ b/mk/cwrappers.mk @@ -1,4 +1,4 @@ -# $NetBSD: cwrappers.mk,v 1.7 2014/11/27 20:32:41 joerg Exp $ +# $NetBSD: cwrappers.mk,v 1.8 2014/11/27 20:33:32 joerg Exp $ # # This Makefile fragment implements integration of pkgtools/cwrappers. @@ -41,6 +41,10 @@ CWRAPPERS_WRAPPEE.ld= ${LD:Ufalse} CWRAPPERS_WRAPPEE.libtool= ${PREFIX}/bin/libtool CWRAPPERS_WRAPPEE.shlibtool= ${PREFIX}/bin/shlibtool +.if defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake) +CWRAPPERS_TRANSFORM.imake+= I:${PREFIX}/lib/X11/config:${PREFIX}/lib/X11/config +.endif + .PHONY: generate-cwrappers do-wrapper: generate-cwrappers @@ -55,7 +59,7 @@ generate-cwrappers: . for cmd in ${WRAPPER_REORDER_CMDS} ${RUN}echo reorder=${cmd:S/^reorder://:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}} . endfor -. for cmd in ${_CWRAPPERS_TRANSFORM} +. for cmd in ${CWRAPPERS_TRANSFORM.${wrappee}} ${_CWRAPPERS_TRANSFORM} ${RUN}echo transform=${cmd:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}} . endfor . for cmd in ${CWRAPPERS_APPEND.${wrappee}:U} |