← Back to branch summary

~ubuntu-branches/ubuntu/raring/heimdal/raring

« back to all changes in this revision

Viewing changes to packages/windows/installer/NTMakefile

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2011-07-21 17:40:58 UTC
  • mfrom: (1.1.12 upstream) (2.4.10 experimental)
  • Revision ID: james.westby@ubuntu.com-20110721174058-byiuowgocek307cs
Tags: 1.5~pre2+git20110720-2
Fix dependency on pthreads when building on Linux 3.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
packages/windows/installer/NTMakefile
110
110
CRTNAME=DebugCRT
111
111
!endif
112
112
 
 
113
!if "$(MMDIR)"==""
113
114
MMDIR=$(ProgramFiles)\Common Files\Merge Modules
114
115
!if !exist($(MMDIR))
115
116
MMDIR=$(SystemDrive)\Program Files (x86)\Common Files\Merge Modules
116
117
!endif
 
118
!endif
117
119
 
118
120
!if exist("$(MMDIR)")
119
121
 
151
153
 
152
154
!ifdef MULTIPLATFORM_INSTALLER
153
155
CANDLEOPTS=$(CANDLEOPTS) -dTarget32
 
156
TYPEOPT=-full
154
157
!else
155
158
!  message Excluding 32-bit components from installer
 
159
TYPEOPT=
156
160
!endif
157
161
 
158
162
INSTDEPS=$(INSTDIR32)\Heimdal.msm \
185
189
!endif
186
190
!endif
187
191
 
188
 
INSTALLER=$(INSTDIR)\Heimdal-$(CPU)$(DEBUGOPT)-$(VERSIOND).msi
 
192
INSTALLER=$(INSTDIR)\Heimdal-$(CPU)$(DEBUGOPT)$(TYPEOPT)-$(VERSIOND).msi
 
193
WIXOBJ=$(OBJ)\heimdal-installer$(TYPEOPT).wixobj
189
194
 
190
 
$(INSTALLER): $(OBJ)\heimdal-installer.wixobj $(THIRDPARTYOBJS) $(INSTDEPS) lang\en-us.wxl
191
 
        $(LIGHT) -out $@ $(OBJ)\heimdal-installer.wixobj $(THIRDPARTYOBJS)      \
 
195
$(INSTALLER): $(WIXOBJ) $(THIRDPARTYOBJS) $(INSTDEPS) lang\en-us.wxl
 
196
        $(LIGHT) -out $@ $(WIXOBJ) $(THIRDPARTYOBJS)    \
192
197
                -sval -cultures:en-us -loc lang\en-us.wxl       \
193
198
                -dWixUILicenseRtf=lang\license-en-us.rtf        \
194
199
                -ext WixUIExtension
195
200
        $(_CODESIGN)
196
201
 
197
 
$(OBJ)\heimdal-installer.wixobj: heimdal-installer.wxs
 
202
$(WIXOBJ): heimdal-installer.wxs
198
203
        $(CANDLE) -arch $(PLATFORM) -o $@ heimdal-installer.wxs \
199
204
                $(CANDLEOPTS) $(THIRDPARTYOPTS)
200
205