diff options
| author | obache <obache> | 2013-02-10 12:03:00 +0000 |
|---|---|---|
| committer | obache <obache> | 2013-02-10 12:03:00 +0000 |
| commit | 77359bec3c74865f4119d13b863ffa9ec6469318 (patch) | |
| tree | 529491020359a0910b86c29308870950f0b7b80d /mk/plist/plist.mk | |
| parent | 45397650100ee5fe4bcb17f86941c0eaf5a5f069 (diff) | |
| download | pkgsrc-77359bec3c74865f4119d13b863ffa9ec6469318.tar.gz | |
Improve PLIST handling for Cygwin (SHLIB_TYPE=PEwin)
* also expand `dlname' in libtool archive
* executable binary files may have .exe extension
* rename shlib extension .so with .dll
Diffstat (limited to 'mk/plist/plist.mk')
| -rw-r--r-- | mk/plist/plist.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index ad2a9c2c5f6..632d3163a4c 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: plist.mk,v 1.44 2012/12/06 11:36:31 jperkin Exp $ +# $NetBSD: plist.mk,v 1.45 2013/02/10 12:03:00 obache Exp $ # # This Makefile fragment handles the creation of PLISTs for use by # pkg_create(8). @@ -111,6 +111,9 @@ _PLIST_MANINSTALL= ${MANINSTALL} _LIBTOOL_EXPAND= \ ${PKGSRC_SETENV} ECHO=${TOOLS_ECHO:Q} GREP=${TOOLS_GREP:Q} \ SORT=${TOOLS_SORT:Q} TEST=${TOOLS_TEST:Q} \ + BASENAME=${BASENAME:Q} DIRNAME=${DIRNAME:Q} \ + PWD_CMD=${PWD_CMD:Q} \ + SHLIB_TYPE=${SHLIB_TYPE:Q} \ ${SH} ${.CURDIR}/../../mk/plist/libtool-expand .if !defined(_IGNORE_INFO_PATH) @@ -193,6 +196,9 @@ _PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-gnu.awk _PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-info.awk _PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-man.awk _PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-libtool.awk +.if ${OPSYS} == "Cygwin" +_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-cygwin.awk +.endif _PLIST_AWK+= ${PLIST_AWK} _PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-default.awk @@ -205,6 +211,7 @@ _SHLIB_AWKFILE.ELF= ${.CURDIR}/../../mk/plist/shlib-elf.awk _SHLIB_AWKFILE.SOM= ${.CURDIR}/../../mk/plist/shlib-som.awk _SHLIB_AWKFILE.aixlib= ${.CURDIR}/../../mk/plist/shlib-elf.awk _SHLIB_AWKFILE.a.out= ${.CURDIR}/../../mk/plist/shlib-aout.awk +_SHLIB_AWKFILE.PEwin= ${.CURDIR}/../../mk/plist/shlib-pe.awk _SHLIB_AWKFILE.dylib= ${.CURDIR}/../../mk/plist/shlib-dylib.awk _SHLIB_AWKFILE.none= ${.CURDIR}/../../mk/plist/shlib-none.awk |