diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-08 10:57:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-08 10:57:57 +0000 |
| commit | c5e0d766bca97512e154d503c103e331e9e95ab7 (patch) | |
| tree | 65ad67a40153d849dc664b706da16f080367d50d /crashrep | |
| parent | 8eb91bebf057795eca004bc75c94fde9a313fcf1 (diff) | |
INTEGRATION: CWS ause070 (1.9.70); FILE MERGED
2006/10/18 15:20:39 hjs 1.9.70.2: #i70136# change check to work with configure default
2006/10/06 13:36:23 hjs 1.9.70.1: #i70136# local targets around .ulf files
Diffstat (limited to 'crashrep')
| -rwxr-xr-x | crashrep/source/win32/makefile.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crashrep/source/win32/makefile.mk b/crashrep/source/win32/makefile.mk index 57aa18ff7269..a52f97f004d7 100755 --- a/crashrep/source/win32/makefile.mk +++ b/crashrep/source/win32/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: rt $ $Date: 2005-09-08 09:44:31 $ +# last change: $Author: kz $ $Date: 2006-11-08 11:57:57 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -55,7 +55,12 @@ OBJFILES=\ $(OBJ)$/soreport.obj\ $(OBJ)$/base64.obj -LNGFILES=..$/all$/crashrep.ulf +.IF "$(WITH_LANG)"!="" +ULFDIR:=$(COMMONMISC)$/crash_res +.ELSE # "$(WITH_LANG)"!="" +ULFDIR:=..$/all +.ENDIF # "$(WITH_LANG)"!="" +LNGFILES=$(ULFDIR)$/crashrep.ulf APP1OBJS=$(OBJFILES) @@ -87,5 +92,5 @@ $(OBJ)$/soreport.obj: $(INCCOM)$/_version.h # using lngconvex.exe $(RCFILES) : $(LNGFILES) makefile.mk rcfooter.txt rcheader.txt rctemplate.txt ctrylnglist.txt - +lngconvex.exe -ulf $(COMMONMISC)$/crash_res$/crashrep.ulf -rc $(RES)$/$(TARGET).rc -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt + +lngconvex.exe -ulf $(ULFDIR)$/crashrep.ulf -rc $(RES)$/$(TARGET).rc -rct rctemplate.txt -rch rcheader.txt -rcf rcfooter.txt |