2
1

100-makeinfo-version.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132
  1. diff -u binutils-2.18-orig/configure binutils-2.18/configure
  2. --- binutils-2.18-orig/configure 2007-08-06 16:29:40.000000000 -0400
  3. +++ binutils-2.18/configure 2007-09-27 22:41:51.000000000 -0400
  4. @@ -6125,10 +6125,10 @@
  5. *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
  6. *)
  7. - # For an installed makeinfo, we require it to be from texinfo 4.4 or
  8. + # For an installed makeinfo, we require it to be from texinfo 4.6 or
  9. # higher, else we use the "missing" dummy.
  10. if ${MAKEINFO} --version \
  11. - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
  12. + | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
  13. :
  14. else
  15. MAKEINFO="$MISSING makeinfo"
  16. diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac
  17. --- binutils-2.18-orig/configure.ac 2007-08-28 16:24:26.000000000 -0400
  18. +++ binutils-2.18/configure.ac 2007-09-27 22:41:00.000000000 -0400
  19. @@ -2400,10 +2400,10 @@
  20. *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
  21. *)
  22. changequote(,)
  23. - # For an installed makeinfo, we require it to be from texinfo 4.4 or
  24. + # For an installed makeinfo, we require it to be from texinfo 4.6 or
  25. # higher, else we use the "missing" dummy.
  26. if ${MAKEINFO} --version \
  27. - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
  28. + | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
  29. :
  30. else
  31. MAKEINFO="$MISSING makeinfo"