From ade5d34e99c859af442842dfb79f8b36910dfc1b Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Sat, 9 May 2009 14:59:08 +0000
Subject: Make USE_DESTDIR=full the default value and retire the option.

---
 mk/bsd.prefs.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'mk/bsd.prefs.mk')

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index da42d819ad1..7c5002c80d1 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.290 2009/04/08 23:03:14 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.291 2009/05/09 14:59:08 joerg Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -381,14 +381,15 @@ do-install:
 USE_DESTDIR?=		no
 PKG_DESTDIR_SUPPORT?=	# empty
 
-.if empty(PKG_DESTDIR_SUPPORT) || (empty(USE_DESTDIR:M[Yy][Ee][Ss]) && empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll]))
+.if !empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll])
+WARNINGS+=	"USE_DESTDIR=full is deprecated, just use USE_DESTDIR=yes"
+USE_DESTDIR:=		yes
+.endif
+
+.if empty(PKG_DESTDIR_SUPPORT) || empty(USE_DESTDIR:M[Yy][Ee][Ss])
 _USE_DESTDIR=		no
 .elif ${PKG_DESTDIR_SUPPORT} == "user-destdir"
-.  if !empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll])
 _USE_DESTDIR=		user-destdir
-.  else
-_USE_DESTDIR=		destdir
-.  endif
 .elif ${PKG_DESTDIR_SUPPORT} == "destdir"
 _USE_DESTDIR=		destdir
 .else
-- 
cgit v1.2.3