[Midnightbsd-cvs] mports [20180] trunk/Mk/components/destdir.mk: fix an issue with destdir

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Sep 8 19:43:52 EDT 2015


Revision: 20180
          http://svnweb.midnightbsd.org/mports/?rev=20180
Author:   laffer1
Date:     2015-09-08 19:43:51 -0400 (Tue, 08 Sep 2015)
Log Message:
-----------
fix an issue with destdir

Modified Paths:
--------------
    trunk/Mk/components/destdir.mk

Modified: trunk/Mk/components/destdir.mk
===================================================================
--- trunk/Mk/components/destdir.mk	2015-09-08 23:28:25 UTC (rev 20179)
+++ trunk/Mk/components/destdir.mk	2015-09-08 23:43:51 UTC (rev 20180)
@@ -8,6 +8,7 @@
 # $MidnightBSD$
 # $FreeBSD: head/Mk/bsd.destdir.mk 340713 2014-01-22 15:12:27Z mat $
 #
+# Please make sure all changes to this file are passed through the maintainer.
 
 DESTDIR_Include_MAINTAINER=	ports at MidnightBSD.org
 
@@ -140,7 +141,7 @@
 		_tp=$${_entry#*:}; \
 		_host_path=`${REALPATH} $${_tp%:*}`; \
 		_dest_path=$${_entry##*:}; \
-		_full_dest_path=`${REALPATH} $${_destdir}/$${_dest_path}`; \
+		_full_dest_path=`${REALPATH} -q $${_destdir}/$${_dest_path} || :`; \
 		_entry_was_created=0; \
 		_entry_should_mount=0; \
 		${DEBUG_MSG} "$${_mount_var}:$${_host_path}:$${_full_dest_path}"; \



More information about the Midnightbsd-cvs mailing list