Re: Build failure [Re: Octave 2.9.11 available for ftp]

[David Bateman]

John W. Eaton wrote:
> On 22-May-2007, David Bateman wrote:
>
> | Opps, ok it seems its been a while since I built from a tar-ball. The
> | conf.texi file is generated however, and must go..
>
> I checked in the following change.
>
> I'll build a 2.9.12 tarball next and make sure it builds on a system
> that does not have the directory tree I use to generate the tarball.
>
> jwe
>   

I think I found a bug in pkg.m that is causing some of the octave-forge
packages not to build.. Can you give me a few hours..

D.


>
>   
> ------------------------------------------------------------------------
>
> doc/ChangeLog:
>
> 2007-05-22  John W. Eaton  <address@hidden>
>
>       * interpreter/Makefile.in (TEXINFO_SOURCE): New variable.
>       (TEXINFO): Define using $(TEXINFO_SOURCE).
>       (DISTFILES): Include $(TEXINFO_SOURCE) in the list, not $(TEXINFO).
>
>
> Index: doc/interpreter/Makefile.in
> ===================================================================
> RCS file: /cvs/octave/doc/interpreter/Makefile.in,v
> retrieving revision 1.143
> diff -u -u -r1.143 Makefile.in
> --- doc/interpreter/Makefile.in       22 May 2007 06:48:18 -0000      1.143
> +++ doc/interpreter/Makefile.in       22 May 2007 16:31:01 -0000
> @@ -76,7 +76,10 @@
>  
>  SUB_TEXINFO := $(SUB_SOURCE:.txi=.texi)
>  
> -TEXINFO := $(MAIN_TEXINFO) $(SUB_TEXINFO) contributors.texi ../conf.texi
> +# Don't list ../conf.texi here.
> +TEXINFO_SOURCE := $(MAIN_TEXINFO) $(SUB_TEXINFO) contributors.texi
> +
> +TEXINFO := $(TEXINFO_SOURCE) ../conf.texi
>  
>  FORMATTED = octave.dvi octave.ps octave.pdf \
>       octave.info octave.info-[0-9]*
> @@ -86,7 +89,7 @@
>  
>  # FIXME -- need to include generated figures here...
>  DISTFILES = Makefile.in contributors.in mkcontrib.awk dir \
> -  munge-texi.cc $(MAN_SRC) $(SOURCES) $(TEXINFO) $(FORMATTED) $(IMAGES)
> +  munge-texi.cc $(MAN_SRC) $(SOURCES) $(TEXINFO_SOURCE) $(FORMATTED) 
> $(IMAGES)
>  
>  DISTDIRS = HTML
>  
>   


-- 
David Bateman                                address@hidden
Motorola Labs - Paris                        +33 1 69 35 48 04 (Ph) 
Parc Les Algorithmes, Commune de St Aubin    +33 6 72 01 06 33 (Mob) 
91193 Gif-Sur-Yvette FRANCE                  +33 1 69 35 77 01 (Fax) 

The information contained in this communication has been classified as: 

[x] General Business Information 
[ ] Motorola Internal Use Only 
[ ] Motorola Confidential Proprietary