diff options
author | wiz <wiz@pkgsrc.org> | 2016-06-19 20:03:09 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2016-06-19 20:03:09 +0000 |
commit | 333e308236fe2b4633b8dd22fc5b323633e2a87f (patch) | |
tree | d85a24a3191729a2010f12d9c270c7379acdb112 /mk | |
parent | 484914cbdc4f30cdd6e6faecba4ed8f737694fa0 (diff) | |
download | pkgsrc-333e308236fe2b4633b8dd22fc5b323633e2a87f.tar.gz |
Get rid of INSTALLATION_PREFIX.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.use.mk | 6 | ||||
-rw-r--r-- | mk/help/directories.help | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 727870eb6ec..9c6683b1057 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.61 2016/06/19 18:01:58 wiz Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.62 2016/06/19 20:03:09 wiz Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -50,11 +50,7 @@ PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q} MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .endif -.if defined(INSTALLATION_PREFIX) -PREFIX= ${INSTALLATION_PREFIX} -.else PREFIX= ${LOCALBASE} -.endif ############################################################################ # General settings diff --git a/mk/help/directories.help b/mk/help/directories.help index ca9c8ac3896..39f39522f4e 100644 --- a/mk/help/directories.help +++ b/mk/help/directories.help @@ -1,17 +1,15 @@ -# $NetBSD: directories.help,v 1.5 2016/06/19 18:01:58 wiz Exp $ +# $NetBSD: directories.help,v 1.6 2016/06/19 20:03:09 wiz Exp $ # # This file contains some short documentation on the directories that # are used within pkgsrc. # PREFIX # This is the directory where the package should install its -# files. The actual value depends on the variable -# INSTALLATION_PREFIX. +# files. This is usually LOCALBASE. # # Tags: read-only, system-defined, non-overridable, etc. # # See also: -# INSTALLATION_PREFIX, # LOCALBASE. # |