diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-06-17 13:44:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-06-17 13:44:18 +0200 |
| commit | e3d5d7185df622151e4c3e3903e513bcabde01ac (patch) | |
| tree | c0b2a89f55f4bc41bf4c05b251bbbb4c2ec3e5bf /scp2 | |
| parent | b1fd3cc07a1ada4a88f589c91292556a3e5a1705 (diff) | |
| parent | d75defa37fb46aedd81e6d6c360375e37e8473e7 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
Makefile.in
bootstrap.1
configure.in
solenv/inc/minor.mk
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/util/makefile.mk | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 8e08d6980bd6..0dd4c7d76148 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1084,7 +1084,7 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl Section = "Version"; Order = 15; Key = "UpdateURL"; - #if defined(BUILD_SPECIAL) + #if defined(ENABLE_ONLINE_UPDATE) #ifdef WNT Value = "${UPDATEURL}"; #else // defined WNT diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index f27828489d64..1504a2ac14f0 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -45,6 +45,10 @@ SCPDEFS+=-D_MSC SCPDEFS+=-DBUILD_SPECIAL .ENDIF +.IF "$(ENABLE_ONLINE_UPDATE)"!="" +SCPDEFS+=-DENABLE_ONLINE_UPDATE +.ENDIF + .IF "$(BUILD_X64)"!="" SCPDEFS+=-DBUILD_X64 .ENDIF diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index a7873d180bbf..90306993b11f 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -215,7 +215,7 @@ SCP1FILES += cairocanvas.par SCP1FILES += layout.par .ENDIF # ENABLE_LAYOUT == TRUE -.IF "$(BUILD_SPECIAL)"!="" +.IF "$(ENABLE_ONLINE_UPDATE)"!="" SCP1FILES += \ module_onlineupdate.par \ file_onlineupdate.par @@ -392,7 +392,7 @@ SCP2FILES += \ SCP2FILES += layout.par .ENDIF # ENABLE_LAYOUT == TRUE -.IF "$(BUILD_SPECIAL)"!="" +.IF "$(ENABLE_ONLINE_UPDATE)"!="" SCP2FILES += \ module_onlineupdate.par \ file_onlineupdate.par |