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

Windows: Build and stage redistributable merge module

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/windows/installer/NTMakefile
View File

@@ -53,7 +53,10 @@ $(OBJ)\heimdal-assemblies.wixobj: heimdal-assemblies.wxs
-dBinDir=$(BINDIR) \ -dBinDir=$(BINDIR) \
-dPlatform=$(PLATFORM) -dPlatform=$(PLATFORM)
all:: $(MERGEMOD) $(SDKREDISTDIR)\Heimdal.msm: $(MERGEMOD)
$(CP) $** $@
all:: $(MERGEMOD) $(SDKREDISTDIR)\Heimdal.msm
clean:: clean::
-$(RM) $(MERGEMOD) -$(RM) $(MERGEMOD)

3
packages/windows/sdk/NTMakefile
View File

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

1
windows/NTMakefile.w32
View File

@@ -86,6 +86,7 @@ SDKDIR =$(SRC)\out
SDKINCDIR =$(SRC)\out\inc SDKINCDIR =$(SRC)\out\inc
SDKLIBDIR =$(SRC)\out\lib\$(CPU) SDKLIBDIR =$(SRC)\out\lib\$(CPU)
SDKSRCDIR =$(SRC)\out\src SDKSRCDIR =$(SRC)\out\src
SDKREDISTDIR =$(SRC)\out\redist\$(CPU)
!ifdef RELDIR !ifdef RELDIR
SRCDIR =$(SRC)\$(RELDIR) SRCDIR =$(SRC)\$(RELDIR)