oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Windows: installer NTMakefile fix thirdparty paths

Browse Source 
The subdirectory level was incorrect in the thirdparty assembly
tests.

Change-Id: Icbb578a5dac11b93ff7f1f5c28caf029e8805eeb
This commit is contained in:
Jeffrey Altman
2013-09-15 11:16:06 -04:00
parent 0f1b15492b
commit cb2896b6e7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/windows/installer/NTMakefile
View File

@@ -31,7 +31,7 @@
RELDIR=packages\windows\installer RELDIR=packages\windows\installer
!include ../../../windows/NTMakefile.w32 !include ..\..\..\windows/NTMakefile.w32
!ifdef BUILD_INSTALLERS !ifdef BUILD_INSTALLERS
@@ -54,8 +54,8 @@ DEBUGOPT=-$(BUILD)
###################################################################### ######################################################################
# Heimdal Merge Modules # Heimdal Merge Modules
!if exist(thirdparty\installer\heimdal-assemblies.wxs) !if exist(..\..\..\thirdparty\installer\heimdal-assemblies.wxs)
ASM_WXS=thirdparty\installer\heimdal-assemblies.wxs ASM_WXS=..\..\..\thirdparty\installer\heimdal-assemblies.wxs
!else !else
ASM_WXS=heimdal-assemblies.wxs ASM_WXS=heimdal-assemblies.wxs
!endif !endif
@@ -75,8 +75,8 @@ $(OBJ)\heimdal-assemblies.wixobj: $(ASM_WXS)
$(SDKREDISTDIR)\Heimdal.msm: $(ASSEMBLYMODULE) $(SDKREDISTDIR)\Heimdal.msm: $(ASSEMBLYMODULE)
$(CP) $** $@ $(CP) $** $@
!if exist(thirdparty\installer\heimdal-policy.wxs) !if exist(..\..\..\thirdparty\installer\heimdal-policy.wxs)
POLICY_WXS=thirdparty\installer\heimdal-policy.wxs POLICY_WXS=..\..\..\thirdparty\installer\heimdal-policy.wxs
!else !else
POLICY_WXS=heimdal-policy.wxs POLICY_WXS=heimdal-policy.wxs
!endif !endif
@@ -167,7 +167,7 @@ CANDLEOPTS= \
-dDocDir=$(DOCDIR) \ -dDocDir=$(DOCDIR) \
-dSrcDir=$(SRC) \ -dSrcDir=$(SRC) \
-dPlatform=$(PLATFORM) \ -dPlatform=$(PLATFORM) \
-dPolPrefix=$(POLPREFIX) \ -dPolPrefix=$(POLPREFIX)
!if "$(CPU)"=="AMD64" !if "$(CPU)"=="AMD64"
@@ -177,7 +177,7 @@ CANDLEOPTS=$(CANDLEOPTS) -dTarget64 \
-dInstDir32=$(INSTDIR32) \ -dInstDir32=$(INSTDIR32) \
-dInstDir64=$(INSTDIR) \ -dInstDir64=$(INSTDIR) \
-dRuntimeModule32=$(RUNTIMEMODULE32) \ -dRuntimeModule32=$(RUNTIMEMODULE32) \
-dRuntimeModule64=$(RUNTIMEMODULE64) \ -dRuntimeModule64=$(RUNTIMEMODULE64)
!ifdef MULTIPLATFORM_INSTALLER !ifdef MULTIPLATFORM_INSTALLER
CANDLEOPTS_MULTI= -dTarget32 CANDLEOPTS_MULTI= -dTarget32