diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
commit | a95376174ec70c4a75569ce6dafacb0f696b21bc (patch) | |
tree | c1b813dddd1c32efb22913cc3b2f5813e6d901ff /set_soenv.in | |
parent | update list (diff) | |
parent | Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3) (diff) | |
download | core-a95376174ec70c4a75569ce6dafacb0f696b21bc.tar.gz core-a95376174ec70c4a75569ce6dafacb0f696b21bc.zip |
Merge commit 'libreoffice-3.4.2.3'
Conflicts:
Makefile.in
configure.in
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/inc/minor.mk
Diffstat (limited to 'set_soenv.in')
-rwxr-xr-x | set_soenv.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/set_soenv.in b/set_soenv.in index f2c47f34bfae..a23a6413883a 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1508,10 +1508,12 @@ ToFile( "Empty", $empty, "n" ); 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( "ABOUT_BITMAP", "@ABOUT_BITMAP@", "e" ); ToFile( "OOO_VENDOR", "@OOO_VENDOR@", "e" ); ToFile( "OOODMAKEMODE", "YES", "e" ); +ToFile( "PRODUCTVERSION", "@PRODUCTVERSION@", "e" ); ToFile( "WITH_POOR_HELP_LOCALIZATIONS", $WITH_POOR_HELP_LOCALIZATIONS, "e" ); ToFile( "CALL_CDECL", $CALL_CDECL, "e" ); @@ -1533,8 +1535,17 @@ ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE", "e" ); ToFile( "PRODUCT", "@PRODUCT@", "e" ); ToFile( "PROFULLSWITCH", "@PROFULLSWITCH@", "e" ); ToFile( "PROEXT", $PROEXT, "e" ); -ToFile( "VALGRIND_CFLAGS", "@VALGRIND_CFLAGS@", "e" ); +ToFile( "VALGRIND_CFLAGS", "@VALGRIND_CFLAGS@","e" ); +ToFile( "WITH_COMPAT_OOWRAPPERS", "@WITH_COMPAT_OOWRAPPERS@", "e" ); ToFile( "UNIXWRAPPERNAME", "@UNIXWRAPPERNAME@","e" ); +ToFile( "PRODUCTNAME", "@PRODUCTNAME@", "e" ); +ToFile( "INSTALLDIRNAME", "@INSTALLDIRNAME@", "e" ); +ToFile( "PREFIXDIR", "@PREFIXDIR@", "e" ); +ToFile( "INSTALLDIR", "@INSTALLDIR@", "e" ); +ToFile( "LIBDIR", "@LIBDIR@", "e" ); +ToFile( "DATADIR", "@DATADIR@", "e" ); +ToFile( "MANDIR", "@MANDIR@", "e" ); +ToFile( "DOCDIR", "@DOCDIR@", "e" ); ToFile( "BUILD_MOZAB", "@BUILD_MOZAB@", "e" ); ToFile( "PREBUILD_MOZAB", $PREBUILD_MOZAB, "e" ); ToFile( "MOZILLA_VERSION", $MOZILLA_VERSION, "e" ); @@ -1556,6 +1567,8 @@ ToFile( "GTHREAD_CFLAGS", "@GTHREAD_CFLAGS@", "e" ); ToFile( "GTHREAD_LIBS", "@GTHREAD_LIBS@", "e" ); ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" ); ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" ); +ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" ); +ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" ); ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" ); ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" ); ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" ); |