Mercurial > octave-nkf
changeset 6654:3390577e4e70
[project @ 2007-05-22 16:33:05 by jwe]
| author | jwe |
|---|---|
| date | Tue, 22 May 2007 16:33:06 +0000 |
| parents | 673686daec87 |
| children | 8dda89ca38f6 |
| files | ChangeLog Makeconf.in doc/ChangeLog doc/interpreter/Makefile.in src/ChangeLog src/Makefile.in |
| diffstat | 6 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue May 22 15:36:10 2007 +0000 +++ b/ChangeLog Tue May 22 16:33:06 2007 +0000 @@ -1,3 +1,7 @@ +2007-05-22 John W. Eaton <jwe@octave.org> + + * Makeconf.in (do-script-uninstall): Also remove directory. + 2007-05-22 Thomas Weber <thomas.weber.mail@gmail.com> * NEWS.2, README.MSVC, WWW/NEWS-2.html: Fix typos.
--- a/Makeconf.in Tue May 22 15:36:10 2007 +0000 +++ b/Makeconf.in Tue May 22 16:33:06 2007 +0000 @@ -638,4 +638,5 @@ do rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/$$f; \ done rm -f $(DESTDIR)$(fcnfiledir)/$(script_sub_dir)/PKG_ADD +-rmdir $(addprefix $(DESTDIR), $(fcnfiledir)/$(script_sub_dir)) endef
--- a/doc/ChangeLog Tue May 22 15:36:10 2007 +0000 +++ b/doc/ChangeLog Tue May 22 16:33:06 2007 +0000 @@ -1,3 +1,9 @@ +2007-05-22 John W. Eaton <jwe@octave.org> + + * interpreter/Makefile.in (TEXINFO_SOURCE): New variable. + (TEXINFO): Define using $(TEXINFO_SOURCE). + (DISTFILES): Include $(TEXINFO_SOURCE) in the list, not $(TEXINFO). + 2007-05-22 Thomas Weber <thomas.weber.mail@gmail.com> * faq/Octave-FAQ.texi, interpreter/basics.txi,
--- a/doc/interpreter/Makefile.in Tue May 22 15:36:10 2007 +0000 +++ b/doc/interpreter/Makefile.in Tue May 22 16:33:06 2007 +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
--- a/src/ChangeLog Tue May 22 15:36:10 2007 +0000 +++ b/src/ChangeLog Tue May 22 16:33:06 2007 +0000 @@ -2,6 +2,10 @@ * version.h (OCTAVE_VERSION): Now 2.9.12. + * Makefile.in (uninstall): Also remove + $(DESTDIR)$(octincludedir)/octave, $(DESTDIR)$(octincludedir), + $(DESTDIR)$(octlibdir), and $(DESTDIR)$(octfiledir). + 2007-05-22 Thomas Weber <thomas.weber.mail@gmail.com> * debug.cc, error.cc, load-save.cc, oct-hist.cc, sighandlers.cc,
--- a/src/Makefile.in Tue May 22 15:36:10 2007 +0000 +++ b/src/Makefile.in Tue May 22 16:33:06 2007 +0000 @@ -470,6 +470,10 @@ done; \ fi rm -f $(DESTDIR)$(octfiledir)/PKG_ADD + -rmdir $(DESTDIR)$(octincludedir)/octave + -rmdir $(DESTDIR)$(octincludedir) + -rmdir $(DESTDIR)$(octlibdir) + -rmdir $(DESTDIR)$(octfiledir) .PHONY: uninstall tags: $(SOURCES) $(DLD_SRC)