Mercurial > hg > octave-terminal
changeset 12625:b1f4f0eba971
merge stable to default
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 19 Apr 2011 22:11:53 -0400 |
parents | b0e60ad4ae26 (current diff) 83606de30dae (diff) |
children | 57e5c31c28d5 |
files | ChangeLog ChangeLog.1 OLD-ChangeLogs/ChangeLog OLD-ChangeLogs/doc-ChangeLog OLD-ChangeLogs/liboctave-ChangeLog OLD-ChangeLogs/scripts-ChangeLog OLD-ChangeLogs/src-ChangeLog OLD-ChangeLogs/test-ChangeLog doc/ChangeLog libcruft/ChangeLog liboctave/ChangeLog scripts/ChangeLog src/ChangeLog test/ChangeLog |
diffstat | 11 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am +++ b/Makefile.am @@ -26,20 +26,27 @@ ACLOCAL_AMFLAGS = -I m4 -BUILT_DISTFILES = AUTHORS BUGS INSTALL.OCTAVE +BUILT_DISTFILES = AUTHORS BUGS ChangeLog INSTALL.OCTAVE EXTRA_DIST = \ AUTHORS \ BUGS \ COPYING \ ChangeLog \ - ChangeLog.1 \ INSTALL \ INSTALL.OCTAVE \ NEWS \ NEWS.1 \ NEWS.2 \ NEWS.3 \ + OLD-ChangeLogs/ChangeLog \ + OLD-ChangeLogs/ChangeLog.1 \ + OLD-ChangeLogs/doc-ChangeLog \ + OLD-ChangeLogs/libcruft-ChangeLog \ + OLD-ChangeLogs/liboctave-ChangeLog \ + OLD-ChangeLogs/scripts-ChangeLog \ + OLD-ChangeLogs/src-ChangeLog \ + OLD-ChangeLogs/test-ChangeLog \ PROJECTS \ README \ README.Cygwin \ @@ -156,6 +163,11 @@ $(MAKE) -C doc/interpreter ../../$@ .PHONY: AUTHORS BUGS INSTALL.OCTAVE +ChangeLog: + (cd $(srcdir); hg log --style=changelog.tmpl --prune=b0e60ad4ae26ec2ca3567a17b29a53e0cd2051d8 --branch=`hg branch`; echo ""; echo "See the files in the OLD-ChangeLogs directory for older changes") > $@.t + mv $@.t $@ +.PHONY: ChangeLog + octetc_DATA = NEWS DIRS_TO_MAKE = \
--- a/autogen.sh +++ b/autogen.sh @@ -15,7 +15,7 @@ ## building the rest of Octave, and INSTALL, which is linked from ## gnulib/doc/INSTALL by the bootstrap script. -for f in NEWS README ChangeLog COPYING; do +for f in NEWS README COPYING; do if ! test -f $f; then echo "required file $f is missing" 2>&1 exit 1