[cpp-sp] branch master updated: Missing slash in Xerces MM makefile dep.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=65a9b140a66eb694498b7a7727970086d6f0d860

The following commit(s) were added to refs/heads/master by this push:
       new  65a9b14   Missing slash in Xerces MM makefile dep.
65a9b14 is described below

commit 65a9b140a66eb694498b7a7727970086d6f0d860
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed May 30 21:17:06 2018 -0400

    Missing slash in Xerces MM makefile dep.
---
 msi/WiX/MergeModules/MergeModules.make | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 51ccb1c..ba6c392 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -68,7 +68,7 @@ FastCGI-x64.wixobj: FastCGI-x64.wxs\
 					-dShibbolethMsVersion=$(MsVCVersion) -dBuildDebug=$(DebugInstaller)
 
 #
-# Log 4 shib.  More complicated since it has a version and a file version (and hence 2 components per architecture)
+# Log4shib.  More complicated since it has a version and a file version (and hence 2 components per architecture)
 #
 Log4Shib-x64.msm: Log4Shib-x64.wixobj
 	light Log4Shib-x64.wixobj
@@ -207,8 +207,8 @@ Xerces-x64.msm: Xerces-x64.wixobj
 	light Xerces-x64.wixobj
 	del ..\*64*.msi
 
-XercesDll32=$(BuildSP)$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
-XercesDebugDll32=$(BuildSP)$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
+XercesDll32=$(BuildSP)\$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
+XercesDebugDll32=$(BuildSP)\$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
 
 Xerces-x86.wixobj: Xerces-x86.wxs $(XercesDll32) Xerces-x86.wxs
 	wixcop -indent:2 Xerces-x86.wxs
@@ -217,8 +217,8 @@ Xerces-x86.wixobj: Xerces-x86.wxs $(XercesDll32) Xerces-x86.wxs
                           -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd)\
                           -dShibbolethMsVersion=$(MsVCVersion) -dxerces=$(Xerces) -dBuildDebug=$(DebugInstaller)
 
-XercesDll64=$(BuildSP)$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
-XercesDebugDll64=$(BuildSP)$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
+XercesDll64=$(BuildSP)\$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
+XercesDebugDll64=$(BuildSP)\$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
 
 Xerces-x64.wixobj: Xerces-x64.wxs $(XercesDll64) Xerces-x86.wxs
 	wixcop -indent:2 Xerces-x64.wxs

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.