Mercurial > octave-nkf
changeset 9855:02d59b67632f
Stop distribution of conf.texi by autotools
conf.texi must not be distributed. Instead it must be re-made from
conf.texi.in during the configure stage of compilation.
| author | Rik <rdrider0-list@yahoo.com> |
|---|---|
| date | Mon, 23 Nov 2009 21:27:40 -0800 |
| parents | 5d5dc23d6c56 |
| children | 870a69bac55c |
| files | doc/ChangeLog doc/faq/Makefile.am doc/interpreter/Makefile.am doc/liboctave/Makefile.am |
| diffstat | 4 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog Mon Nov 23 16:56:35 2009 -0800 +++ b/doc/ChangeLog Mon Nov 23 21:27:40 2009 -0800 @@ -1,3 +1,9 @@ +2009-11-23 Rik <octave@nomad.inbox5.com> + + * faq/Makefile.am, interpreter/Makefile.am, liboctave/Makefile.am: + Stop distribution of conf.texi by autotools. conf.texi must be re-made + from conf.texi.in during configure step + 2009-11-23 Rik <octave@nomad.inbox5.com> * Makefile.am: Add . to SUBDIRS to force automake to compile this
--- a/doc/faq/Makefile.am Mon Nov 23 16:56:35 2009 -0800 +++ b/doc/faq/Makefile.am Mon Nov 23 21:27:40 2009 -0800 @@ -27,7 +27,7 @@ info_TEXINFOS = OctaveFAQ.texi -OctaveFAQ_TEXINFOS = ../conf.texi +nodist_OctaveFAQ_TEXINFOS = ../conf.texi ../conf.texi: $(MAKE) -C .. conf.texi
--- a/doc/interpreter/Makefile.am Mon Nov 23 16:56:35 2009 -0800 +++ b/doc/interpreter/Makefile.am Mon Nov 23 21:27:40 2009 -0800 @@ -134,8 +134,10 @@ var.texi info_TEXINFOS = octave.texi -octave_TEXINFOS = \ - ../conf.texi \ +nodist_octave_TEXINFOS = \ + ../conf.texi + +dist_octave_TEXINFOS = \ contributors.texi \ $(MUNGED_TEXI_SRC)
--- a/doc/liboctave/Makefile.am Mon Nov 23 16:56:35 2009 -0800 +++ b/doc/liboctave/Makefile.am Mon Nov 23 21:27:40 2009 -0800 @@ -33,8 +33,10 @@ info_TEXINFOS = liboctave.texi -liboctave_TEXINFOS = \ - ../conf.texi \ +nodist_liboctave_TEXINFOS = \ + ../conf.texi + +dist_liboctave_TEXINFOS = \ array.texi \ bugs.texi \ cp-idx.texi \