diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 10 | ||||
| -rw-r--r-- | mk/flavor/pkg/flavor-vars.mk | 4 | ||||
| -rw-r--r-- | mk/flavor/pkg/package.mk | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index b6f8c9d22ba..6a90a65c8d9 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.237 2006/09/27 15:18:15 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.238 2006/10/06 14:51:36 joerg Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -360,16 +360,16 @@ USE_INET6= YES USE_INET6= NO .endif -LOCALBASE?= ${DESTDIR}/usr/pkg +LOCALBASE?= /usr/pkg X11_TYPE?= native .if !empty(X11_TYPE:Mnative) . if ${OPSYS} == "SunOS" # On Solaris, we default to using OpenWindows for X11. -X11BASE?= ${DESTDIR}/usr/openwin +X11BASE?= /usr/openwin . elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" -X11BASE?= ${DESTDIR}/usr +X11BASE?= /usr . else -X11BASE?= ${DESTDIR}/usr/X11R6 +X11BASE?= /usr/X11R6 . endif .endif CROSSBASE?= ${LOCALBASE}/cross diff --git a/mk/flavor/pkg/flavor-vars.mk b/mk/flavor/pkg/flavor-vars.mk index 95e2a22e405..b351282b82e 100644 --- a/mk/flavor/pkg/flavor-vars.mk +++ b/mk/flavor/pkg/flavor-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: flavor-vars.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $ +# $NetBSD: flavor-vars.mk,v 1.2 2006/10/06 14:51:36 joerg Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -16,7 +16,7 @@ USE_TOOLS+= date .endif # This is the package database directory for the default view. -PKG_DBDIR?= ${DESTDIR}/var/db/pkg +PKG_DBDIR?= /var/db/pkg # _PKG_DBDIR is the actual packages database directory where we register # packages. diff --git a/mk/flavor/pkg/package.mk b/mk/flavor/pkg/package.mk index 47bbdb2173d..303fdb75cd0 100644 --- a/mk/flavor/pkg/package.mk +++ b/mk/flavor/pkg/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.2 2006/06/05 22:49:44 jlam Exp $ +# $NetBSD: package.mk,v 1.3 2006/10/06 14:51:36 joerg Exp $ PKG_SUFX?= .tgz PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} @@ -29,7 +29,7 @@ package-check-installed: package-create: package-remove ${PKGFILE} package-links _PKG_ARGS_PACKAGE+= ${_PKG_CREATE_ARGS} -_PKG_ARGS_PACKAGE+= -p ${PREFIX:S/^${DESTDIR}//} +_PKG_ARGS_PACKAGE+= -p ${PREFIX} _PKG_ARGS_PACKAGE+= -L ${PREFIX} # @src ... .if ${PKG_INSTALLATION_TYPE} == "pkgviews" _PKG_ARGS_PACKAGE+= -E |