diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-08-27 16:47:08 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-08-28 00:20:47 +0900 |
| commit | 246d26faecb809cf4f013b3fcd1368892100217a (patch) | |
| tree | cd83ab24ccfcec3776b586cdc63dfbaeffdc5589 | |
| parent | 71c1de8f01d10197226a4d8a441089dee879b3cb (diff) | |
Fix typo LD_LIBARY_PATH
Change-Id: Iff2b85db621eb7b40d8a46a6452b8cae01a91e2e
| -rw-r--r-- | odk/setsdkenv_unix.csh.in | 6 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in index f5a2cdcc154e..34bebd71cd11 100644 --- a/odk/setsdkenv_unix.csh.in +++ b/odk/setsdkenv_unix.csh.in @@ -104,7 +104,7 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) set exampleout=SOLARISexample.out # set LD_LIBRARY_PATH - if ( $?LD_LIBARY_PATH == 0) then + if ( $?LD_LIBRARY_PATH == 0) then setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:. else setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} @@ -125,7 +125,7 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) set platform=Linux # set LD_LIBRARY_PATH - if ( $?LD_LIBARY_PATH == 0) then + if ( $?LD_LIBRARY_PATH == 0) then setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:. else setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} @@ -167,7 +167,7 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`) set platform=FreeBSD # set LD_LIBRARY_PATH - if ( $?LD_LIBARY_PATH == 0) then + if ( $?LD_LIBRARY_PATH == 0) then setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:. else setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 7d7da01c3557..817b449cddbc 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -2401,7 +2401,7 @@ sub create_packages_without_epm if ( $rpm_failed ) { - # Because of the problems with LD_LIBARY_PATH, a direct call of local "rpm" or "rpmbuild" might be successful + # Because of the problems with LD_LIBRARY_PATH, a direct call of local "rpm" or "rpmbuild" might be successful my $rpmprog = ""; if ( -f "/usr/bin/rpmbuild" ) { $rpmprog = "/usr/bin/rpmbuild"; } elsif ( -f "/usr/bin/rpm" ) { $rpmprog = "/usr/bin/rpm"; } @@ -2420,7 +2420,7 @@ sub create_packages_without_epm my $helperreturnvalue = $?; # $? contains the return value of the systemcall - $infoline = "\nLast try: Using $rpmprog directly (problem with LD_LIBARY_PATH)\n"; + $infoline = "\nLast try: Using $rpmprog directly (problem with LD_LIBRARY_PATH)\n"; push( @installer::globals::logfileinfo, $infoline); $infoline = "\nSystemcall: $helpersystemcall\n"; |