diff options
author | jperkin <jperkin> | 2012-12-06 11:36:30 +0000 |
---|---|---|
committer | jperkin <jperkin> | 2012-12-06 11:36:30 +0000 |
commit | 8f700afa302e02d9ba9b8680de99b903e2a9ea60 (patch) | |
tree | 84f766bb8b9cbffe0b57fcfa317b3e88d3d29f7f /mk/plist/plist.mk | |
parent | 9d33eae41ea88b933bf4b8886c642fe24e17a260 (diff) | |
download | pkgsrc-8f700afa302e02d9ba9b8680de99b903e2a9ea60.tar.gz |
Introduce PKGGNUDIR as a way to control gnu prefix.
By default pkgsrc uses LOCABASE/gnu as a prefix for packages to install
native versions of GNU tools, which are them symbolically linked back to
the 'g' versions of the files in LOCALBASE, and users can then add
LOCALBASE/gnu/bin to PATH to pick up those tools.
On systems where the GNU environment is desired, PKGGNUDIR now allows
users to install the non-'g' files directly into LOCALBASE, making them
the default without having to alter PATH, whilst retaining the 'g' files
in order to ensure dependencies and tool paths remain the same.
Diffstat (limited to 'mk/plist/plist.mk')
-rw-r--r-- | mk/plist/plist.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index ff0417fa580..ad2a9c2c5f6 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: plist.mk,v 1.43 2012/05/27 14:32:28 cheusov Exp $ +# $NetBSD: plist.mk,v 1.44 2012/12/06 11:36:31 jperkin Exp $ # # This Makefile fragment handles the creation of PLISTs for use by # pkg_create(8). @@ -136,6 +136,7 @@ _PLIST_AWK_ENV+= LIBTOOL_EXPAND=${_LIBTOOL_EXPAND:Q} _PLIST_AWK_ENV+= LS=${TOOLS_LS:Q} _PLIST_AWK_ENV+= MANINSTALL=${_PLIST_MANINSTALL:Q} _PLIST_AWK_ENV+= MANZ=${_MANZ:Q} +_PLIST_AWK_ENV+= PKGGNUDIR=${PKGGNUDIR:Q} _PLIST_AWK_ENV+= PKGMANDIR=${PKGMANDIR:Q} _PLIST_AWK_ENV+= PREFIX=${DESTDIR:Q}${PREFIX:Q} _PLIST_AWK_ENV+= TEST=${TOOLS_TEST:Q} @@ -169,6 +170,7 @@ PLIST_SUBST+= OPSYS=${OPSYS:Q} \ RMDIR=${RMDIR:Q} \ RM=${RM:Q} \ TRUE=${TRUE:Q} \ + PKGGNUDIR=${PKGGNUDIR:Q} \ PKGMANDIR=${PKGMANDIR:Q} .for _var_ in ${PLIST_VARS} @@ -187,6 +189,7 @@ _PLIST_1_AWK+= -f ${PKGSRCDIR}/mk/plist/plist-macros.awk _PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-functions.awk _PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-locale.awk +_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 |