This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH: Fix fallout from at-file.texi in Makefile.in, texi2pod


It turns out that older versions of makeinfo and texi2pod.pl both fail
to support:

  @include @value{...}

This patch makes the top-level Makefile require makeinfo 4.8.  (I don't
know if versions between 4.2 and 4.8 would work just as well, but it
doesn't seem unreasonable to move up to 4.8, which has been out for a
while.)   That change was tested by building with makeinfo 4.5 and
makeinfo 4.8 and confirming that the build said:

*** Makeinfo is missing. Info documentation will not be built.

(There was a subsequent build error in bfd where it tried to use
makeinfo, even though it had been detected missing, but that can't be
my fault.)

The texi2pod.pl change has been tested by building the binutils manual
pages, including the as/ld changes that Nick approved, but which I did
not check in because they broke the manual pages. 

OK?

--
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

2005-10-11  Mark Mitchell  <mark@codesourcery.com>

	* Makefile.tpl (MAKEINFO): Require makeinfo 4.8.

2005-10-11  Mark Mitchell  <mark@codesourcery.com>

	* texi2pod.pl: Substitue for @value even when part of @include. 

Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/Makefile.tpl,v
retrieving revision 1.226
diff -c -5 -p -r1.226 Makefile.tpl
*** Makefile.tpl 6 Oct 2005 15:24:36 -0000	1.226
--- Makefile.tpl 11 Oct 2005 18:13:27 -0000
*************** LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/
*** 274,292 ****
  CONFIGURED_M4 = @CONFIGURED_M4@
  M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
  	then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
  	else echo ${CONFIGURED_M4} ; fi`
  
! # For an installed makeinfo, we require it to be from texinfo 4.2 or
  # higher, else we use the "missing" dummy.  We also pass the subdirectory
  # makeinfo even if only the Makefile is there, because Texinfo builds its
  # manual when made, and it requires its own version.
  CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
  MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
  	then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
  	else if (${CONFIGURED_MAKEINFO} --version \
! 	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
          then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
  
  # This just becomes part of the MAKEINFO definition passed down to
  # sub-makes.  It lets flags be given on the command line while still
  # using the makeinfo from the object tree.
--- 274,292 ----
  CONFIGURED_M4 = @CONFIGURED_M4@
  M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
  	then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
  	else echo ${CONFIGURED_M4} ; fi`
  
! # For an installed makeinfo, we require it to be from texinfo 4.8 or
  # higher, else we use the "missing" dummy.  We also pass the subdirectory
  # makeinfo even if only the Makefile is there, because Texinfo builds its
  # manual when made, and it requires its own version.
  CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
  MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
  	then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
  	else if (${CONFIGURED_MAKEINFO} --version \
! 	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[8-9]|[5-9])') >/dev/null 2>&1; \
          then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
  
  # This just becomes part of the MAKEINFO definition passed down to
  # sub-makes.  It lets flags be given on the command line while still
  # using the makeinfo from the object tree.
Index: etc/texi2pod.pl
===================================================================
RCS file: /cvs/src/src/etc/texi2pod.pl,v
retrieving revision 1.2
diff -c -5 -p -r1.2 texi2pod.pl
*** etc/texi2pod.pl	11 Jun 2002 15:34:33 -0000	1.2
--- etc/texi2pod.pl	11 Oct 2005 18:13:27 -0000
*************** while(<$inf>) {
*** 225,239 ****
      # Single line command handlers.
  
      /^\@include\s+(.+)$/ and do {
  	push @instack, $inf;
  	$inf = gensym();
  
  	# Try cwd and $ibase.
! 	open($inf, "<" . $1) 
! 	    or open($inf, "<" . $ibase . "/" . $1)
! 		or die "cannot open $1 or $ibase/$1: $!\n";
  	next;
      };
  
      /^\@(?:section|unnumbered|unnumberedsec|center)\s+(.+)$/
  	and $_ = "\n=head2 $1\n";
--- 225,240 ----
      # Single line command handlers.
  
      /^\@include\s+(.+)$/ and do {
  	push @instack, $inf;
  	$inf = gensym();
+ 	$file = postprocess($1);
  
  	# Try cwd and $ibase.
! 	open($inf, "<" . $file) 
! 	    or open($inf, "<" . $ibase . "/" . $file)
! 		or die "cannot open $file or $ibase/$file: $!\n";
  	next;
      };
  
      /^\@(?:section|unnumbered|unnumberedsec|center)\s+(.+)$/
  	and $_ = "\n=head2 $1\n";


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]