Index: kde-2.0.1/koffice-2.0.1/admin/ltmain.sh
diff -c kde-2.0.1/koffice-2.0.1/admin/ltmain.sh:1.1 kde-2.0.1/koffice-2.0.1/admin/ltmain.sh:1.3
*** kde-2.0.1/koffice-2.0.1/admin/ltmain.sh:1.1	Tue Dec  5 16:03:56 2000
--- kde-2.0.1/koffice-2.0.1/admin/ltmain.sh	Tue Jan 23 07:42:36 2001
***************
*** 2854,2859 ****
--- 2854,2861 ----
  	     test -n "$hardcode_libdirs"; then
  	    libdir="$hardcode_libdirs"
  	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ 	  else
+ 	    dep_rpath="${wl}-bnolibpath"
  	  fi
  	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
  	    # We should set the runpath_var.
***************
*** 3260,3265 ****
--- 3262,3269 ----
  	 test -n "$hardcode_libdirs"; then
  	libdir="$hardcode_libdirs"
  	eval rpath=\" $hardcode_libdir_flag_spec\"
+       else
+         dep_rpath=" ${wl}-bnolibpath"
        fi
        compile_rpath="$rpath"
  
***************
*** 3296,3301 ****
--- 3300,3307 ----
  	 test -n "$hardcode_libdirs"; then
  	libdir="$hardcode_libdirs"
  	eval rpath=\" $hardcode_libdir_flag_spec\"
+       else
+         dep_rpath=" ${wl}-bnolibpath"
        fi
        finalize_rpath="$rpath"
  
***************
*** 3488,3494 ****
        # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
        case "$host" in
          *-*-aix4*) compile_command="$compile_command $wl-brtl"
!                    finalize_command="$finalize_command $wl-brtl" ;;
        esac
  
        if test $need_relink = no || test "$build_libtool_libs" != yes; then
--- 3494,3502 ----
        # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
        case "$host" in
          *-*-aix4*) compile_command="$compile_command $wl-brtl"
!                    compile_command=`$echo "X$compile_command" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
!                    finalize_command="$finalize_command $wl-brtl"
!                    finalize_command=`$echo "X$finalize_command" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
        esac
  
        if test $need_relink = no || test "$build_libtool_libs" != yes; then
***************
*** 4369,4378 ****
  	      esac
  	    fi
  	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
! 	    if test -n "$libdir" && test ! -f "$libfile"; then
! 	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
! 	      finalize=no
! 	    fi
  	  done
  
  	  relink_command=
--- 4378,4395 ----
  	      esac
  	    fi
  	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
!             # Make sure we look in the destination dir as well as the final dir
!             if test -z "$DESTDIR"; then
! 	      if test -n "$libdir" && test ! -f "$libfile"; then
! 		$echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
! 		finalize=no
! 	      fi
!             else
!               if test -n "$libdir" && test ! -f "$libfile" && test -n "$DESTDIR/$libdir" && test ! -f "$DESTDIR/$libfile"; then
!                 $echo "$modename: warning: \`$lib' has not been installed in \`$libdir' or \`\$DESTDIR/$libdir'" 1>&2
!                 finalize=no
!               fi
!             fi
  	  done
  
  	  relink_command=
***************
*** 4397,4402 ****
--- 4414,4421 ----
  	      outputname="$tmpdir/$file"
  	      # Replace the output file specification.
  	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+               # Make sure we look in the destination dir as well as the final dir
+               test -z "$DESTDIR" || relink_command=`$echo "X$relink_command" | $Xsed -e 's%-L'"$libdir"'%-L'"$libdir"' -L'"$DESTDIR/$libdir"'%g'`
  
  	      $show "$relink_command"
  	      if $run eval "$relink_command"; then :
Index: kde-2.0.1/koffice-2.0.1/filters/olefilters/excel97/records.h
diff -c kde-2.0.1/koffice-2.0.1/filters/olefilters/excel97/records.h:1.1 kde-2.0.1/koffice-2.0.1/filters/olefilters/excel97/records.h:1.2
*** kde-2.0.1/koffice-2.0.1/filters/olefilters/excel97/records.h:1.1	Tue Dec  5 16:03:09 2000
--- kde-2.0.1/koffice-2.0.1/filters/olefilters/excel97/records.h	Thu Dec  7 08:48:56 2000
***************
*** 24,30 ****
    bool (XMLTree::*func)(Q_UINT16 size, QDataStream& body);
  };
  
! const record biff[] = {
    { 0x0022, &XMLTree::_1904 },
    { 0x0221, &XMLTree::_array },
    { 0x0040, &XMLTree::_backup },
--- 24,30 ----
    bool (XMLTree::*func)(Q_UINT16 size, QDataStream& body);
  };
  
! record biff[] = {
    { 0x0022, &XMLTree::_1904 },
    { 0x0221, &XMLTree::_array },
    { 0x0040, &XMLTree::_backup },