diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-30 17:44:21 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-30 17:50:43 +0200 |
| commit | 674a7b44f3b9a90b0b6ed7fa8928ccd0efb597f8 (patch) | |
| tree | 44cee4b100632398df260c567d5f713706b95d87 /config_host.mk.in | |
| parent | 148c7629fc844db690075b9df62677b5e902c9f0 (diff) | |
install branding images using filelists
This also reinstates the use of brand_dev/intro.png for non-release
builds, lost with gbuildization of instsetoo_native (commit
1d84e9d1d363bd550129efcbeafe670c0a049dd0).
Change-Id: I43477505c5c9a3d6ec961d640608e6e91379868e
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 82dfd50792d3..8696a920fba9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -12,7 +12,6 @@ gb_SPACE:=$(gb_SPACE) $(gb_SPACE) export SRC_ROOT=@SRC_ROOT@ export BUILDDIR=@BUILDDIR@ -export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@ @x_AFLAGS@ export AFLAGS=@AFLAGS@ export ALLOC=@ALLOC@ export ALL_LANGS=@ALL_LANGS@ @@ -36,6 +35,7 @@ export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@ export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@ export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@ +export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@ export BSH_JAR=@BSH_JAR@ export BUILD_PLATFORM=@build@ export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@ @@ -75,6 +75,8 @@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ export CURL_LIBS=$(gb_SPACE)@CURL_LIBS@ +export CUSTOM_BRAND_DIR=@CUSTOM_BRAND_DIR@ +export CUSTOM_BRAND_IMAGES=@CUSTOM_BRAND_IMAGES@ export CXX=@CXX@ export CXX_FOR_BUILD=@CXX_FOR_BUILD@ export CXX_X64_BINARY=@CXX_X64_BINARY@ @@ -85,6 +87,7 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@ export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@ export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@ +export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DEFAULT_TO_ENGLISH_FOR_PACKING=yes export DEVINSTALLDIR=@DEVINSTALLDIR@ export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@ @@ -168,7 +171,6 @@ export EPM_FLAGS=@EPM_FLAGS@ export EXTERNAL_WARNINGS_NOT_ERRORS=@EXTERNAL_WARNINGS_NOT_ERRORS@ export debug=@ENABLE_DEBUG@ @x_Cygwin@ export FIND=@WIN_FIND@ -export FLAT_LOGO_SVG=@FLAT_LOGO_SVG@ export FLEX=@FLEX@ export FLUTE_JAR=@FLUTE_JAR@ export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@ @@ -257,7 +259,6 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ export INSTDIR=@INSTDIR@ export INSTALLDIR=@INSTALLDIR@ export INSTALLDIRNAME=@INSTALLDIRNAME@ -export INTRO_BITMAP=@INTRO_BITMAP@ export JAVACISGCJ=@JAVACISGCJ@ export JAVACISKAFFE=@JAVACISKAFFE@ export JAVACOMPILER=@JAVACOMPILER@ @@ -456,11 +457,6 @@ export SOLAR_JAVA=@SOLAR_JAVA@ export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@ export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@ export SRCDIR=@SRC_ROOT@ -export STARTCENTER_LEFT_BITMAP=@STARTCENTER_LEFT_BITMAP@ -export STARTCENTER_RIGHT_BITMAP=@STARTCENTER_RIGHT_BITMAP@ -export STARTCENTER_RTL_LEFT_BITMAP=@STARTCENTER_RTL_LEFT_BITMAP@ -export STARTCENTER_RTL_RIGHT_BITMAP=@STARTCENTER_RTL_RIGHT_BITMAP@ -export STARTCENTER_SPACE_BITMAP=@STARTCENTER_SPACE_BITMAP@ export STRIP=@STRIP@ export STRIP_COMPONENTS=@STRIP_COMPONENTS@ export SUNTEMPLATES_DE_PACK=@SUNTEMPLATES_DE_PACK@ |