svn commit: r228122 - head/usr.sbin/mergemaster

[Doug Barton]

Author: dougb
Date: Tue Nov 29 08:22:12 2011
New Revision: 228122
URL: http://svn.freebsd.org/changeset/base/228122

Log:
  If using DISTDIR we need to be sure to create a ${DESTDIR}/var/db/zoneinfo
  
  PR:		bin/162891
  Submitted by:	Helge Oldach <src-mergemaster-nov11 at oldach.net>

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Tue Nov 29 08:21:54 2011	(r228121)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Tue Nov 29 08:22:12 2011	(r228122)
@@ -1336,14 +1336,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