diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-21 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 13:59:58 +0200 |
| commit | b786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch) | |
| tree | a0adbba80933544e1912adeb29a8e79797b7fc1c /odk/setsdkenv_unix.csh.in | |
| parent | 3535ceeac6f1b4277279082998663feb84d05487 (diff) | |
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'odk/setsdkenv_unix.csh.in')
| -rw-r--r-- | odk/setsdkenv_unix.csh.in | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in index f48be7b6ce99..f5a2cdcc154e 100644 --- a/odk/setsdkenv_unix.csh.in +++ b/odk/setsdkenv_unix.csh.in @@ -65,11 +65,6 @@ if ( "${OFFICE_HOME}" != "" ) then setenv OFFICE_PROGRAM_PATH "${OFFICE_HOME}/${programdir}" endif -# Set office base program path. -if ( "${OFFICE_BASE_HOME}" != "" ) then - setenv OFFICE_BASE_PROGRAM_PATH "${OFFICE_BASE_HOME}/program" -endif - # Set UNO path, necessary to ensure that the cpp examples using the # new UNO bootstrap mechanism use the configured office installation. @@ -83,8 +78,8 @@ if ( "${OO_SDK_URE_HOME}" != "" ) then setenv OO_SDK_URE_JAVA_DIR "${OO_SDK_URE_HOME}/share/java" else setenv OO_SDK_URE_BIN_DIR "${OFFICE_PROGRAM_PATH}" - setenv OO_SDK_URE_LIB_DIR "${OFFICE_BASE_PROGRAM_PATH}" - setenv OO_SDK_URE_JAVA_DIR "${OFFICE_BASE_PROGRAM_PATH}/classes" + setenv OO_SDK_URE_LIB_DIR "${OFFICE_PROGRAM_PATH}" + setenv OO_SDK_URE_JAVA_DIR "${OFFICE_PROGRAM_PATH}/classes" endif # Set SDK example output directory @@ -261,7 +256,6 @@ echo " * SDK environment is prepared for ${platform}" echo " *" echo " * SDK = ${OO_SDK_HOME}" echo " * Office = ${OFFICE_HOME}" -echo " * Office Base = ${OFFICE_BASE_HOME}" echo " * URE = ${OO_SDK_URE_HOME}" echo " * Make = ${OO_SDK_MAKE_HOME}" echo " * Zip = ${OO_SDK_ZIP_HOME}" |