svn commit: r228171 - stable/8/usr.sbin/mergemaster

[Doug Barton]

Author: dougb
Date: Thu Dec  1 05:53:30 2011
New Revision: 228171
URL: http://svn.freebsd.org/changeset/base/228171

Log:
  MFC r228122:
  
  If using DESTDIR we need to be sure to create a
  ${DESTDIR}/var/db/zoneinfo

Modified:
  stable/8/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/8/usr.sbin/mergemaster/   (props changed)

Modified: stable/8/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/8/usr.sbin/mergemaster/mergemaster.sh	Thu Dec  1 05:52:50 2011	(r228170)
+++ stable/8/usr.sbin/mergemaster/mergemaster.sh	Thu Dec  1 05:53:30 2011	(r228171)
@@ -1338,14 +1338,14 @@ esac
 
 if [ -e "${DESTDIR}/etc/localtime" ]; then	# Ignore if TZ == UTC
   echo ''
+  [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}"
   if [ -f "${DESTDIR}/var/db/zoneinfo" ]; then
     echo "*** Reinstalling `cat ${DESTDIR}/var/db/zoneinfo` as ${DESTDIR}/etc/localtime"
-    [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}"
     tzsetup $tzs_args -r
   else
     echo "*** There is no ${DESTDIR}/var/db/zoneinfo file to update ${DESTDIR}/etc/localtime."
     echo '    You should run tzsetup'
-    run_it_now tzsetup
+    run_it_now "tzsetup $tzs_args"
   fi
 fi