diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-12-31 22:06:44 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-01-01 16:05:46 -0600 |
| commit | 804a69656027a4b6cbee299ffb271e83d7e46f5c (patch) | |
| tree | 655bbdf024e9fd951dd7b0105501401d69306f9e | |
| parent | 8033e3343b6e043abe2ef31ba2c90e3f5382ad25 (diff) | |
migrate ABOUT_BITMAP and INTRO_BITMAP out of set_soenv.in
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | desktop/branding/Makefile | 4 | ||||
| -rwxr-xr-x | set_soenv.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 17761650671b..c60b08eb3b2d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -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@" diff --git a/desktop/branding/Makefile b/desktop/branding/Makefile index 7b062a346875..46ca14dd0574 100644 --- a/desktop/branding/Makefile +++ b/desktop/branding/Makefile @@ -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 diff --git a/set_soenv.in b/set_soenv.in index e63e44c7a065..6bb81f7b0be5 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -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" ); |