Mercurial > hg > octave-avbm
changeset 8719:679c270b7584
install DOC and NEWS in $octetcdir
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 11 Feb 2009 01:02:54 -0500 |
parents | c74c9692add7 |
children | dda421a1f1e6 |
files | ChangeLog Makeconf.in configure.in doc/ChangeLog doc/interpreter/Makefile.in octMakefile.in scripts/ChangeLog scripts/miscellaneous/news.m src/ChangeLog src/defaults.h.in src/toplev.cc |
diffstat | 11 files changed, 40 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-02-11 John W. Eaton <jwe@octave.org> + + * configure.in (octetcdir): New default value. + * Makeconf.in (octetcdir): New variable. + (do-subst-default-vals): Substitute octetcdir. + * octMakefile.in (install, uninstall): Use $(octetcdir) for NEWS. + 2009-02-10 Rafael Laboissiere <rafael@debian.org> * examples/Makefile.in: Run some clean targets on sub-directory
--- a/Makeconf.in +++ b/Makeconf.in @@ -287,6 +287,9 @@ libdir = @libdir@ +# Where to install and expect extra files like NEWS and DOC. +octetcdir = @octetcdir@ + # Where to install and expect libraries like libcruft.a, liboctave.a, # and other architecture-dependent data. octlibdir = @octlibdir@ @@ -579,6 +582,7 @@ -e "s|%OCTAVE_MAN1EXT%|\"${man1ext}\"|" \ -e "s|%OCTAVE_MANDIR%|\"${mandir}\"|" \ -e "s|%OCTAVE_OCTFILEDIR%|\"${octfiledir}\"|" \ + -e "s|%OCTAVE_OCTETCDIR%|\"${octetcdir}\"|" \ -e "s|%OCTAVE_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ -e "s|%OCTAVE_OCTLIBDIR%|\"${octlibdir}\"|" \ -e "s|%OCTAVE_STARTUPFILEDIR%|\"${startupfiledir}\"|" \
--- a/configure.in +++ b/configure.in @@ -95,6 +95,7 @@ OCTAVE_SET_DEFAULT(localapifcnfiledir, '$(datadir)/octave/site/$(api_version)/m') OCTAVE_SET_DEFAULT(localverfcnfiledir, '$(datadir)/octave/$(version)/site/m') +OCTAVE_SET_DEFAULT(octetcdir, '$(datadir)/octave/$(version)/etc') OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)/octave-$(version)') OCTAVE_SET_DEFAULT(archlibdir, '$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)')
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2009-02-11 John W. Eaton <jwe@octave.org> + + * interpreter/Makefile.in (uninstall): Use $(DESTDIR) here too. + Uninstall Info dir file. Uninstall DOC file. + (install): Install DOC file. + 2009-02-10 John W. Eaton <jwe@octave.org> * interpreter/Makefile.in (DOC): New target.
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -330,11 +330,14 @@ $(INSTALL_DATA) $(srcdir)/dir $(DESTDIR)$(infodir)/dir; \ fi; \ fi + $(INSTALL_DATA) DOC $(DESTDIR)$(octetcdir)/DOC .PHONY: install install-strip uninstall: @$(subdir-for-command) - rm -f $(infodir)/octave.info* + rm -f $(DESTDIR)$(infodir)/octave.info* + rm -f $(DESTDIR)$(infodir)/dir + rm -f $(DESTDIR)$(octetcdir)/DOC for f in $(MAN_BASE); do rm -f $(DESTDIR)$(man1dir)/$$f$(man1ext); done .PHONY: uninstall
--- a/octMakefile.in +++ b/octMakefile.in @@ -132,7 +132,7 @@ $(INSTALL_SCRIPT) mkoctfile $(DESTDIR)$(bindir)/mkoctfile-$(version) (cd $(DESTDIR)$(bindir); $(LN_S) mkoctfile-$(version) $(DESTDIR)$(bindir)/mkoctfile) $(INSTALL_DATA) config.h $(DESTDIR)$(octincludedir)/octave/config.h - $(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(datadir)/octave/$(version)/NEWS + $(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(octetcdir)/NEWS uninstall:: rm -f $(DESTDIR)$(bindir)/octave-bug @@ -142,7 +142,7 @@ rm -f $(DESTDIR)$(bindir)/mkoctfile rm -f $(DESTDIR)$(bindir)/mkoctfile-$(version) rm -f $(DESTDIR)$(octincludedir)/octave/config.h - rm -f $(DESTDIR)$(datadir)/octave/$(version)/NEWS + rm -f $(DESTDIR)$(octetcdir)/NEWS maintainer-clean:: @echo ""
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2009-02-11 John W. Eaton <jwe@octave.org> + + * miscellaneous/news.m: Look in octetcdir for NEWS file. + 2009-02-09 Jaroslav Hajek <highegg@gmail.com> * general/interp2.m: Added support for pchip bicubic interpolation.
--- a/scripts/miscellaneous/news.m +++ b/scripts/miscellaneous/news.m @@ -23,8 +23,8 @@ function news () - datadir = octave_config_info ("datadir"); - newsfile = fullfile (datadir, "octave", version (), "NEWS"); + octetcdir = octave_config_info ("octetcdir"); + newsfile = fullfile (octetcdir, "NEWS"); if (exist (newsfile, "file")) f = fopen (newsfile, "r");
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-02-11 John W. Eaton <jwe@octave.org> + + * toplev.cc (octave_config_info): Add octetcdir to the struct. + * defaults.h.in (OCTAVE_OCTETCDIR): New macro. + 2009-02-10 Jaroslav Hajek <highegg@gmail.com> * DLD-FUNCTIONS/__pchip_deriv__.cc (F__pchip_deriv__):
--- a/src/defaults.h.in +++ b/src/defaults.h.in @@ -145,6 +145,10 @@ #define OCTAVE_OCTFILEDIR %OCTAVE_OCTFILEDIR% #endif +#ifndef OCTAVE_OCTETCDIR +#define OCTAVE_OCTETCDIR %OCTAVE_OCTETCDIR% +#endif + #ifndef OCTAVE_OCTINCLUDEDIR #define OCTAVE_OCTINCLUDEDIR %OCTAVE_OCTINCLUDEDIR% #endif
--- a/src/toplev.cc +++ b/src/toplev.cc @@ -1239,6 +1239,7 @@ { false, "man1ext", OCTAVE_MAN1EXT }, { true, "mandir", OCTAVE_MANDIR }, { true, "octfiledir", OCTAVE_OCTFILEDIR }, + { true, "octetcdir", OCTAVE_OCTETCDIR }, { true, "octincludedir", OCTAVE_OCTINCLUDEDIR }, { true, "octlibdir", OCTAVE_OCTLIBDIR }, { true, "prefix", OCTAVE_PREFIX },