mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

39 lines
1.6 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/gcc/gcc34/install_so.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./install-sh.orig 2003-07-20 11:40:28.000000000 +0200
  20. +++ ./install-sh 2003-11-02 17:04:13.000000000 +0100
  21. @@ -279,8 +279,15 @@
  22. && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
  23. # Now rename the file to the real destination.
  24. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
  25. - || {
  26. + if echo $dstdir/$dstfile | grep -q 'lib/.*\.so' ; then
  27. + $doit $mvcmd $dsttmp $dstdir/$dstfile
  28. + rc=$?
  29. + else
  30. + $doit $rmcmd -f $dstdir/$dstfile &&
  31. + $doit $mvcmd $dsttmp $dstdir/$dstfile
  32. + rc=$?
  33. + fi
  34. + [ $rc -eq 0 ] || {
  35. # The rename failed, perhaps because mv can't rename something else
  36. # to itself, or perhaps because mv is so ancient that it does not
  37. # support -f.