Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Sep 2013 21:21:06 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r328054 - head/Mk
Message-ID:  <201309232121.r8NLL6HU076325@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Sep 23 21:21:05 2013
New Revision: 328054
URL: http://svnweb.freebsd.org/changeset/ports/328054

Log:
  Fix STAGEDIR support for ports using DESKTOP_ENTRIES
  
  Reported by:	bsam
  Tested by:	bsam

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Sep 23 21:16:32 2013	(r328053)
+++ head/Mk/bsd.port.mk	Mon Sep 23 21:21:05 2013	(r328054)
@@ -6557,7 +6557,7 @@ install-desktop-entries:
 	fi; \
 	while [ $$# -gt 6 ]; do \
 		filename="`${ECHO_CMD} "$$4" | ${SED} -e 's,^/,,g;s,[/ ],_,g;s,[^_[:alnum:]],,g'`.desktop"; \
-		pathname="${DESKTOPDIR}/$$filename"; \
+		pathname="${STAGEDIR}${DESKTOPDIR}/$$filename"; \
 		categories="$$5"; \
 		if [ -z "$$categories" ]; then \
 			categories="`cd ${.CURDIR} && ${MAKE} desktop-categories`"; \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309232121.r8NLL6HU076325>