svn commit: r369052 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Tue Sep 23 12:42:00 2014
New Revision: 369052
URL: http://svnweb.freebsd.org/changeset/ports/369052
QAT: https://qat.redports.org/buildarchive/r369052/

Log:
  Register license files with absolute path
  That makes it still respecting PREFIX while making it more robust to plist using @cwd

Modified:
  head/Mk/bsd.licenses.mk

Modified: head/Mk/bsd.licenses.mk
==============================================================================
--- head/Mk/bsd.licenses.mk	Tue Sep 23 12:38:17 2014	(r369051)
+++ head/Mk/bsd.licenses.mk	Tue Sep 23 12:42:00 2014	(r369052)
@@ -146,7 +146,6 @@ _LICENSE_LIST_PORT_VARS=	PERMS NAME GROU
 # Path variables
 #
 # _LICENSE_DIR		- Directory to install licenses
-# _LICENSE_DIR_REL	- Same as above, without ${PREFIX}
 # _LICENSE_STORE	- Store for known license files
 # _LICENSE_CATALOG	- License catalog (make include file) to be created (dst)
 # _LICENSE_CATALOG_TMP	- Same as above, but in WRKDIR (src)
@@ -157,7 +156,6 @@ _LICENSE_LIST_PORT_VARS=	PERMS NAME GROU
 # 					  few more targets only.
 
 _LICENSE_DIR?=		${PREFIX}/share/licenses/${PKGNAME}
-_LICENSE_DIR_REL?=	share/licenses/${PKGNAME}
 _LICENSE_STORE?=	${PORTSDIR}/Templates/Licenses
 _LICENSE_CATALOG?=	${_LICENSE_DIR}/catalog.mk
 _LICENSE_CATALOG_TMP?=	${WRKDIR}/.license-catalog.mk
@@ -747,15 +745,15 @@ ${_LICENSE_COOKIE}:
 # Package list entries, and installation
 
 .if !defined(NO_LICENSES_INSTALL)
-PLIST_FILES+=	${_LICENSE_DIR_REL}/${_LICENSE_CATALOG:T} \
-				${_LICENSE_DIR_REL}/${_LICENSE_REPORT:T}
+PLIST_FILES+=	${_LICENSE_CATALOG} \
+				${_LICENSE_REPORT}
 
 .if ${_LICENSE_COMB} == "single"
-PLIST_FILES+=	${_LICENSE_DIR_REL}/${_LICENSE}
+PLIST_FILES+=	${_LICENSE_DIR}/${_LICENSE}
 .else
 .	for lic in ${_LICENSE}
 .		if defined(_LICENSE_FILE_${lic})
-PLIST_FILES+=	${_LICENSE_DIR_REL}/${lic}
+PLIST_FILES+=	${_LICENSE_DIR}/${lic}
 .		endif
 .	endfor
 .endif