diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile index 52fc0f24a..f54cf9866 100644 --- a/packages/windows/installer/NTMakefile +++ b/packages/windows/installer/NTMakefile @@ -53,7 +53,10 @@ $(OBJ)\heimdal-assemblies.wixobj: heimdal-assemblies.wxs -dBinDir=$(BINDIR) \ -dPlatform=$(PLATFORM) -all:: $(MERGEMOD) +$(SDKREDISTDIR)\Heimdal.msm: $(MERGEMOD) + $(CP) $** $@ + +all:: $(MERGEMOD) $(SDKREDISTDIR)\Heimdal.msm clean:: -$(RM) $(MERGEMOD) diff --git a/packages/windows/sdk/NTMakefile b/packages/windows/sdk/NTMakefile index 9812ef64f..205d493dd 100644 --- a/packages/windows/sdk/NTMakefile +++ b/packages/windows/sdk/NTMakefile @@ -54,6 +54,9 @@ mksdkdirs: ! if !exist($(SDKLIBDIR)) $(MKDIR) $(SDKLIBDIR) ! endif +! if !exist($(SDKREDISTDIR)) + $(MKDIR) $(SDKREDISTDIR) +! endif INCFILES=\ $(SDKINCDIR)\com_err.h \ diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32 index 291417da5..fdcf8826e 100644 --- a/windows/NTMakefile.w32 +++ b/windows/NTMakefile.w32 @@ -86,6 +86,7 @@ SDKDIR =$(SRC)\out SDKINCDIR =$(SRC)\out\inc SDKLIBDIR =$(SRC)\out\lib\$(CPU) SDKSRCDIR =$(SRC)\out\src +SDKREDISTDIR =$(SRC)\out\redist\$(CPU) !ifdef RELDIR SRCDIR =$(SRC)\$(RELDIR)