summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2010-07-16 08:47:44 +0100
committerCaolán McNamara <cmc@openoffice.org>2010-07-16 08:47:44 +0100
commit0f4075c50d34c177dab87cae1dc9e1218d29b19e (patch)
tree52897c3c864988454046dd8be3a27f3d51cc3850 /solenv
parent9345119d4da6dea75c3aa0bfa167f2c16b544864 (diff)
cmcfixes77: #i80021# system libtextcat
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/ziplist.pm1
-rw-r--r--[-rwxr-xr-x]solenv/config/sdev300.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index ddc98c43bdb7..ef537c097efc 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -806,6 +806,7 @@ sub add_variables_to_allvariableshashref
$variableshashref->{'PRODUCTMINOR'} = $localminor;
$variableshashref->{'PRODUCTBUILDID'} = $installer::globals::buildid;
+ $variableshashref->{'LIBTEXTCAT_SYSTEM_DIR'} = $ENV{'LIBTEXTCAT_SYSTEM_DIR'} , if( defined $ENV{'LIBTEXTCAT_SYSTEM_DIR'} && $ENV{'LIBTEXTCAT_SYSTEM_DIR'} ne "" );
}
1;
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 3e80e1460885..e5ac5994a370 100755..100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,7 +8,7 @@ common
BIG_SVX TRUE
BMP_WRITES_FLAG TRUE
BUILD_SPECIAL TRUE
- BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
+ BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT
common_build TRUE
COMMON_OUTDIR common
CONFIG_PROJECT config_office