mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate ABOUT_BITMAP and INTRO_BITMAP out of set_soenv.in

Browse Source
This commit is contained in:
Norbert Thiebaud 2011-12-31 22:06:44 -06:00
parent 8033e3343b
commit 804a696560
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config_host.mk.in
View File

@ -4,6 +4,7 @@
#
export SRC_ROOT="@SRC_ROOT@"
export ABOUT_BITMAP="@ABOUT_BITMAP@"
export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
export CAIRO_LIBS="@CAIRO_LIBS@"
export CDR_CFLAGS="@CDR_CFLAGS@"
@ -91,6 +92,7 @@ export HUNSPELL_CFLAGS="@HUNSPELL_CFLAGS@"
export HUNSPELL_LIBS="@HUNSPELL_LIBS@"
export INPATH="@INPATH@"
export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@"
export INTRO_BIPMAP="@INTRO_BITMAP@"
export KDE4_CFLAGS="@KDE4_CFLAGS@"
export KDE4_LIBS="@KDE4_LIBS@"
export KDE_CFLAGS="@KDE_CFLAGS@"

4
desktop/branding/Makefile
View File

@ -27,11 +27,11 @@
SRCDIR := $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/../..)
ifndef ABOUT_BITMAP
ifeq ($(strip $(ABOUT_BITMAP)),)
ABOUT_BITMAP := $(SRCDIR)/default_images/brand/about.png
endif
ifndef INTRO_BITMAP
ifeq ($(strip $(INTRO_BITMAP)),)
INTRO_BITMAP := $(SRCDIR)/default_images/brand/intro.png
endif

2
set_soenv.in
View File

@ -1234,12 +1234,10 @@ ToFile( "Platform independent constant values.", $empty, "c" );
# Languages
ToFile( "WITH_LANG", "@WITH_LANG@", "e" );
ToFile( "WITH_LANG_LIST", "@WITH_LANG_LIST@", "e" );
ToFile( "INTRO_BITMAP", "@INTRO_BITMAP@", "e" );
ToFile( "PROGRESSBARCOLOR", "@PROGRESSBARCOLOR@", "e" );
ToFile( "PROGRESSSIZE", "@PROGRESSSIZE@", "e" );
ToFile( "PROGRESSPOSITION", "@PROGRESSPOSITION@", "e" );
ToFile( "PROGRESSFRAMECOLOR","@PROGRESSFRAMECOLOR@", "e" );
ToFile( "ABOUT_BITMAP", "@ABOUT_BITMAP@", "e" );
ToFile( "STARTCENTER_LEFT_BITMAP", "@STARTCENTER_LEFT_BITMAP@", "e" );
ToFile( "STARTCENTER_RIGHT_BITMAP", "@STARTCENTER_RIGHT_BITMAP@", "e" );
ToFile( "STARTCENTER_RTL_LEFT_BITMAP", "@STARTCENTER_RTL_LEFT_BITMAP@", "e" );