From owner-p4-projects@FreeBSD.ORG  Wed Jul 19 13:38:57 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0DBE916A4DE; Wed, 19 Jul 2006 13:38:57 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E0B2616A4DD
	for <perforce@FreeBSD.org>; Wed, 19 Jul 2006 13:38:56 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 97AA843D45
	for <perforce@FreeBSD.org>; Wed, 19 Jul 2006 13:38:56 +0000 (GMT)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6JDcuAx042277
	for <perforce@FreeBSD.org>; Wed, 19 Jul 2006 13:38:56 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6JDcuMN042274
	for perforce@freebsd.org; Wed, 19 Jul 2006 13:38:56 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Wed, 19 Jul 2006 13:38:56 GMT
Message-Id: <200607191338.k6JDcuMN042274@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@FreeBSD.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 101927 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jul 2006 13:38:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=101927

Change 101927 by gabor@gabor_spitfire on 2006/07/19 13:38:42

	Add some checks against DESTDIR.  It can't be /, or can't have a
	trailing slash, but has to be an absolute path.  These checks
	can be ignored by setting IGNORE_PATH_CHECKS.

Affected files ...

.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#43 edit

Differences ...

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#43 (text+ko) ====

@@ -1307,12 +1307,31 @@
 .endif
 DISTNAME?=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
 
-# Disallow setting DESTDIR to /.
-.if defined(DESTDIR) && ${DESTDIR} == "/"
+# These do some path checks if DESTDIR is set correctly.
+# You can force skipping these test by defining IGNORE_PATH_CHECKS
+.if !defined(IGNORE_PATH_CHECKS)
+.if defined(DESTDIR)
+.if (${DESTDIR:C,(^.).*,\1,} != "/")
+.if ${DESTDIR} == "/"
+.BEGIN:
+	@${ECHO_MSG} "You can't set DESTDIR to /. Please re-run make with"
+	@${ECHO_MSG} "DESTDIR unset."
+	@${FALSE}
+.else
+.BEGIN:
+	@${ECHO_MSG} "DESTDIR must be defined as an absolute path so that when 'make'"
+	@${ECHO_MSG} "is invoked in the work area DESTDIR points to the right place."
+	@${FALSE}
+.endif
+.endif
+.if (${DESTDIR:C,^.*(/)$$,\1,} == "/")
 .BEGIN:
-	@${ECHO_MSG} "You can't set DESTDIR to /. Unset DESTDIR and re-run make."
+	@${ECHO_MSG} "DESTDIR can't have a trailing slash. Please remove the trailing"
+	@${ECHO_MSG} "slash and re-run 'make'"
 	@${FALSE}
 .endif
+.endif
+.endif
 
 # These need to be absolute since we don't know how deep in the ports
 # tree we are and thus can't go relative.  They can, of course, be overridden