Windows: Build and stage redistributable merge module

This commit is contained in:
Asanka C. Herath
2010-09-23 15:10:31 -04:00
parent f44925e8a6
commit f0b9e01eac
3 changed files with 8 additions and 1 deletions

View File

@@ -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)

View File

@@ -54,6 +54,9 @@ mksdkdirs:
! if !exist($(SDKLIBDIR))
$(MKDIR) $(SDKLIBDIR)
! endif
! if !exist($(SDKREDISTDIR))
$(MKDIR) $(SDKREDISTDIR)
! endif
INCFILES=\
$(SDKINCDIR)\com_err.h \

View File

@@ -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)