CVS commit: pkgsrc/mk

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jun 19 20:03:09 UTC 2016

Modified Files:
        pkgsrc/mk: bsd.pkg.use.mk
        pkgsrc/mk/help: directories.help

Log Message:
Get rid of INSTALLATION_PREFIX.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/mk/bsd.pkg.use.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/help/directories.help

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/bsd.pkg.use.mk
diff -u pkgsrc/mk/bsd.pkg.use.mk:1.61 pkgsrc/mk/bsd.pkg.use.mk:1.62
--- pkgsrc/mk/bsd.pkg.use.mk:1.61       Sun Jun 19 18:01:58 2016
+++ pkgsrc/mk/bsd.pkg.use.mk    Sun Jun 19 20:03:09 2016
@@ -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=${IMAK
 MAKE_FLAGS+=           CC=${CC:Q} CXX=${CXX:Q}
 .endif
 
-.if defined(INSTALLATION_PREFIX)
-PREFIX=                        ${INSTALLATION_PREFIX}
-.else
 PREFIX=                        ${LOCALBASE}
-.endif
 
 ############################################################################
 # General settings

Index: pkgsrc/mk/help/directories.help
diff -u pkgsrc/mk/help/directories.help:1.5 pkgsrc/mk/help/directories.help:1.6
--- pkgsrc/mk/help/directories.help:1.5 Sun Jun 19 18:01:58 2016
+++ pkgsrc/mk/help/directories.help     Sun Jun 19 20:03:09 2016
@@ -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.
 #