diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 15:17:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 15:17:41 +0000 |
| commit | 96f02cf7f2976a8185ba65b73235d645e9789522 (patch) | |
| tree | 669320a33547abd4f4a07cfafcfcbb830db0ffb9 /solenv | |
| parent | 860dcc1354d65e39a847d6ae67ff84daa415452b (diff) | |
INTEGRATION: CWS ooo20031110 (1.138.8); FILE MERGED
2003/11/09 09:03:05 waratah 1.138.8.2: Message has \ that is lost, changing to unix / which will not disappear
2003/10/23 13:19:12 hjs 1.138.8.1: #i21388# set COMMON_OUTDIR to OUTPATH if common_build not set
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/settings.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index a22546c7c540..977380800b03 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -2,9 +2,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.138 $ +# $Revision: 1.139 $ # -# last change: $Author: rt $ $Date: 2003-09-22 07:38:39 $ +# last change: $Author: rt $ $Date: 2003-12-01 16:17:41 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -110,7 +110,7 @@ SOLARVERSION=$(SOLARVER)$/$(UPD) .ELSE # "$(SOURCEVERSION)"=="$(WORK_STAMP)" @+echo "#" @+echo "#" - @+echo "#" ERROR: minor.mk in solenv\inc does not match your version! + @+echo "# ERROR: minor.mk in solenv/inc does not match your version!" @+echo "#" @+echo "#" force_dmake_to_error @@ -589,8 +589,8 @@ ROUT=$(OUTPATH).tlk .ENDIF # common output tree -COMMON_OUTDIR*=common .IF "$(common_build)"!="" +COMMON_OUTDIR*=common .IF "$(no_common_build_reslib)"=="" common_build_reslib=true .ENDIF # "$(no_common_build_reslib)"=="" @@ -600,6 +600,8 @@ common_build_zip=true .IF "$(no_common_build_sign_jar)"=="" common_build_sign_jar=true .ENDIF # "$(no_common_build_sign_jar)"=="" +.ELSE # "$(common_build)"!="" +COMMON_OUTDIR=$(OUTPATH) .ENDIF # "$(common_build)"!="" # --- generate output tree ----------------------------------------- |