--- a/make_release_packages	Mon Aug 15 14:20:11 2011 -0700
+++ b/make_release_packages	Mon Aug 15 14:36:26 2011 -0700
@@ -70,11 +70,11 @@
 
 if [[ -z "${XNV_BUILDNUM}" ]] ; then
     # Get build version from hg by searching for most recent tag matching nv_*
-    BUILD_TAG="$(hg log | \
-        perl -l -n -e 'if ($_ =~ m/^tag:\s+nv_([\d\.]+)/) {print $1 ; exit}')"
+    BUILD_TAG="$(hg parent --template '{latesttag}\n' | \
+        perl -l -n -e 'if ($_ =~ m/^nv_(\d+)/) {print $1}')"
 
     if [[ -z "${BUILD_TAG}" ]] ; then
-	fatal_error "BUILD_TAG could not be found from hg_log"
+	fatal_error "BUILD_TAG could not be found from hg parent"
     fi
     XNV_BUILDNUM="${BUILD_TAG}"
 fi
@@ -90,11 +90,11 @@
 
 cd pkg
 ${XMAKE} clean > "${LOG}" 2>&1
-${XMAKE} install XNV_BUILDNUM="${XNV_BUILDNUM}" "${PUBLISHER_FLAGS}" > "${LOG}" 2>&1
+${XMAKE} install TRUNKID="${XNV_BUILDNUM}" "${PUBLISHER_FLAGS}" > "${LOG}" 2>&1
 print "Result log is in ${LOG}"
 
 print "Checking built packages"
-${XMAKE} check XNV_BUILDNUM="${XNV_BUILDNUM}" > "${CHECK_LOG}" 2>&1
+${XMAKE} check TRUNKID="${XNV_BUILDNUM}" > "${CHECK_LOG}" 2>&1
 print "Package check log is in ${CHECK_LOG}"
 
 "${BUILD_TOOLS}/find-build-errors" -s "${LOG}"