[Xquartz-changes] [654] trunk/mk_x11_dist.sh

[source_changes at macosforge.org]

Revision: 654
          http://trac.macosforge.org/projects/xquartz/changeset/654
Author:   jeremyhu at freedesktop.org
Date:     2012-08-28 23:05:58 -0700 (Tue, 28 Aug 2012)
Log Message:
-----------
Adjust for build directories

Modified Paths:
--------------
    trunk/mk_x11_dist.sh

Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh	2012-08-29 05:51:47 UTC (rev 653)
+++ trunk/mk_x11_dist.sh	2012-08-29 06:05:58 UTC (rev 654)
@@ -138,11 +138,16 @@
 bit() {
 	local PROJECT="${1}" ; shift
 	local SRCROOT="${1}" ; shift
-	local DSTROOT="${BUILDRECORDS}/${PROJECT}.roots/${PROJECT}~dst"
-	local SYMROOT="${BUILDRECORDS}/${PROJECT}.roots/${PROJECT}~sym"
+	local EXTRA=""
 
 	pushd "${SRCROOT}" || die
+
+	[[ "$(basename $(pwd))" != "${PROJECT}" ]] && EXTRA="_$(basename $(pwd))"
+	local DSTROOT="${BUILDRECORDS}/${PROJECT}${EXTRA}.roots/${PROJECT}${EXTRA}~dst"
+	local SYMROOT="${BUILDRECORDS}/${PROJECT}${EXTRA}.roots/${PROJECT}${EXTRA}~sym"
+
 	${BUILDIT} -rootsDirectory "${BUILDRECORDS}" -project "${PROJECT}" . "${@}" || die
+
 	popd || die
 
 	local MERGE_DIR
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20120828/7ee06d10/attachment.html>