Georg Baum wrote:
> Am Montag, 3. Oktober 2005 14:51 schrieb Angus Leeming:
>
>> I also note that it's an old version of automake (1.6) although
>> autogen.sh is currently set up to accept it.
>
> OK, by typing
>
> apt-get install automake1.6
> update-alternatives --set automake /usr/bin/automake-1.6
>
> I switched to automake 1.6 and tested it. The latest version of the patch
> is attached. It works for me both with automake 1.6 and 1.9.
>
> I really would like to commit that, since the current setup is broken.
> Angues, Helge, Kayvan, is that working for you, too?
On a pristine and up to date CVS tree, everything looks fine with this
patch.
Angus
$ cd build && make maintainer-clean
$ cd ..
$ rm -rf autom4te.cache build
$ patch -p1 < TOC3.diff
patching file lib/doc/depend.py
patching file lib/doc/Makefile.am
patching file lib/doc/Makefile.depend
(I removed the ChangeLog entry because gmane mangled your email address.)
$ sh ./autogen.sh
Using automake (GNU automake) 1.6.3
Using autoconf (GNU Autoconf) 2.59
Locating GNU m4... /usr/bin/m4
Generate acinclude.m4... done.
Building macros...
.
done.
Building config header template...
.
done.
Building Makefile templates...
.
done.
Building configure...
.
done.
Building lib/configure ... done.
run "./configure ; make"
$ mkdir build && cd build
$ ../configure \
LDFLAGS='-Wl,-t' \
--with-version-suffix \
--disable-stdlib-debug \
--with-frontend='qt xforms' \
--with-qt-includes='/usr/include/qt3'
$ cd lib && make
Making all in doc
make[1]: Entering directory `/disk4/lyx/devel/build/lib/doc'
make[1]: Nothing to be done for `all'.
make[1]: Leaving directory `/disk4/lyx/devel/build/lib/doc'
Making all in lyx2lyx
make[1]: Entering directory `/disk4/lyx/devel/build/lib/lyx2lyx'
make[1]: Nothing to be done for `all'.
make[1]: Leaving directory `/disk4/lyx/devel/build/lib/lyx2lyx'
make[1]: Entering directory `/disk4/lyx/devel/build/lib'
make[1]: Nothing to be done for `all-am'.
make[1]: Leaving directory `/disk4/lyx/devel/build/lib'
$ su
$ rm -rf /usr/local/share/lyx-1.4.0cvs
$ make install
$ ls /usr/local/share/lyx-1.4.0cvs/doc/
Customization.lyx eu_Extended.lyx no_Intro.lyx
DocStyle.lyx eu_FAQ.lyx no_TOC.lyx
Extended.lyx eu_Intro.lyx pl_Extended.lyx
FAQ.lyx eu_TOC.lyx pl_Intro.lyx
Intro.lyx eu_Tutorial.lyx pl_TOC.lyx
LaTeXConfig.lyx eu_UserGuide.lyx pl_Tutorial.lyx
LaTeXConfig.lyx.in fr_Customization.lyx platypus.eps
Reference.lyx fr_Extended.lyx pt_Intro.lyx
TOC.lyx fr_FAQ.lyx pt_TOC.lyx
Tutorial.lyx fr_Intro.lyx pt_Tutorial.lyx
UserGuide.lyx fr_TOC.lyx ro_Intro.lyx
cs_TOC.lyx fr_Tutorial.lyx ro_TOC.lyx
cs_Tutorial.lyx fr_UserGuide.lyx ru_FAQ.lyx
da_Intro.lyx he_Intro.lyx ru_Intro.lyx
da_TOC.lyx he_TOC.lyx ru_TOC.lyx
de_Customization.lyx he_Tutorial.lyx ru_Tutorial.lyx
de_Extended.lyx hu_Intro.lyx sk_TOC.lyx
de_FAQ.lyx hu_TOC.lyx sk_Tutorial.lyx
de_Intro.lyx it_Customization.lyx sk_UserGuide.lyx
de_TOC.lyx it_Intro.lyx sl_Intro.lyx
de_Tutorial.lyx it_TOC.lyx sl_TOC.lyx
de_UserGuide.lyx it_Tutorial.lyx sl_Tutorial.lyx
es_Intro.lyx it_UserGuide.lyx sv_Intro.lyx
es_TOC.lyx mobius.eps sv_TOC.lyx
es_Tutorial.lyx nl_Intro.lyx sv_Tutorial.lyx
escher-lsd.eps nl_TOC.lyx
eu_Customization.lyx nl_Tutorial.lyx
