diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-08 11:06:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-08 11:06:30 +0000 |
| commit | 0caede6a3f65a58fa75ef2887521945fc555f429 (patch) | |
| tree | 33c028d3a722ffcf498bce7bb9134ac5ad5682d6 /desktop/win32/source/setup | |
| parent | cb62a103e051da98ce4fbbf57e6fca0d5c8b2a7e (diff) | |
INTEGRATION: CWS ause070 (1.8.6); FILE MERGED
2006/10/18 15:18:48 hjs 1.8.6.2: #i70136# change check to work with configure default
2006/10/06 13:28:14 hjs 1.8.6.1: #i70136# local targets around .ulf files
Diffstat (limited to 'desktop/win32/source/setup')
| -rw-r--r-- | desktop/win32/source/setup/makefile.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk index b47c13f8d0..86037c9df1 100644 --- a/desktop/win32/source/setup/makefile.mk +++ b/desktop/win32/source/setup/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: vg $ $Date: 2006-09-25 13:19:23 $ +# last change: $Author: kz $ $Date: 2006-11-08 12:06:30 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -55,6 +55,12 @@ RCFILES= $(RES)$/$(TARGET).rc ULFFILES= setup.ulf +.IF "$(WITH_LANG)"!="" +ULFDIR:=$(COMMONMISC)$/$(TARGET) +.ELSE # "$(WITH_LANG)"!="" +ULFDIR:=. +.ENDIF # "$(WITH_LANG)"!="" + OBJFILES= $(OBJ)$/setup_main.obj \ $(OBJ)$/setup_a.obj \ $(OBJ)$/setup_w.obj @@ -81,6 +87,6 @@ APP1NOSVRES= $(RES)$/$(TARGET).res .INCLUDE : target.mk -$(RCFILES) : $(COMMONMISC)$/$(TARGET)$/setup.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt - $(WRAPCMD) lngconvex.exe -ulf $(COMMONMISC)$/$(TARGET)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt +$(RCFILES) : $(ULFDIR)$/setup.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt + $(WRAPCMD) lngconvex.exe -ulf $(ULFDIR)$/setup.ulf -rc $(RCFILES) -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt |