From: Tom Yu <tlyu@mit.edu>
Date: Fri, 30 Mar 2007 20:53:59 +0000 (+0000)
Subject: pull up r19233 from trunk
X-Git-Tag: kfw-3.2.0-beta1~24
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8990ab30ec5a5f8a4022708283e7e59450bfbf48;p=krb5.git

pull up r19233 from trunk

 r19233@cathode-dark-space:  kpkoch | 2007-03-16 14:35:59 -0400
 Update 3.1.0 to 3.2.0; update location of sample directory.

 Ticket: 5409
 Target_Version: 1.6.1
 Tags: pullup

ticket: 5490

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19354 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index 2e270826d..ce31bd9f0 100644
--- a/src/windows/installer/wix/site-local.wxi
+++ b/src/windows/installer/wix/site-local.wxi
@@ -6,13 +6,13 @@
     <!-- TargetDir should point to build target directory and must end with 
          a backslash.  If not specified, assume we are in TargetDir\install -->
 
-    <?define TargetDir="c:\temp\kfw\kfw-3.1.0-alpha\"?>
+    <?define TargetDir="c:\temp\kfw\kfw-3.2.0-alpha\"?>
 
     <!-- ConfigDir should point to directory containing configuration files 
          (krb5.ini, krb.con, krbrealm.con) to be bundled with the installer.
          The directory name should end with a backslash. -->
 
-    <?define ConfigDir="c:\temp\kfw\kfw-2.5-extra\sample-config\"?>
+    <?define ConfigDir="C:\Projects\Autobuild\pismere\staging\sample\"?>
     
     <!-- VersionMajor, VersionMinor and VersionPatch must all be specified, or 
          none should be specified (in which case, the defaults will be
@@ -73,7 +73,7 @@
 
     <?ifndef VersionMajor?>
         <?define VersionMajor="3"?>
-        <?define VersionMinor="1"?>
+        <?define VersionMinor="2"?>
         <?define VersionPatch="0"?>
     <?else?>
         <?if Not ($(var.VersionMinor) And $(var.VersionPatch))?>