Mercurial > octave-nkf
changeset 423:49345c503741
[project @ 1994-05-23 21:01:01 by jwe]
| author | jwe |
|---|---|
| date | Mon, 23 May 1994 21:04:55 +0000 |
| parents | 875977d1f8cf |
| children | 9056cee2487d |
| files | Makeconf.in acconfig.h src/Makefile.in src/defaults.h.in |
| diffstat | 4 files changed, 26 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.in Mon May 23 20:50:51 1994 +0000 +++ b/Makeconf.in Mon May 23 21:04:55 1994 +0000 @@ -117,6 +117,14 @@ # The type of computer we are running on. target_host_type = @target_host_type@ +# Normally this is the same as $(prefix). With --run-in-place it is +# $(srcdir). +OCTAVE_HOME = @OCTAVE_HOME@ + +# These are not used unless RUN_IN_PLACE is defined. +OCTAVE_INFO_DIR = @OCTAVE_INFO_DIR@ +OCTAVE_LIB_DIR = @OCTAVE_LIB_DIR@ + # The following pattern rules and the substitution functions require # GNU make. If you don't have it, get it!
--- a/acconfig.h Mon May 23 20:50:51 1994 +0000 +++ b/acconfig.h Mon May 23 21:04:55 1994 +0000 @@ -43,6 +43,10 @@ /* Define if you don't have NPSOL. */ #undef NPSOL_MISSING +/* Define to make Octave look for info files and function files in the + directory tree as the sources. */ +#undef RUN_IN_PLACE + /* Define if this is Octave. */ #undef OCTAVE_SOURCE
--- a/src/Makefile.in Mon May 23 20:50:51 1994 +0000 +++ b/src/Makefile.in Mon May 23 21:04:55 1994 +0000 @@ -147,7 +147,9 @@ @echo "Making defaults.h from defaults.h.in..." @(sed < $(srcdir)/defaults.h.in > defaults.h.tmp \ -e 's;%DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";' \ - -e 's;%OCTAVE_HOME%;\"${prefix}\";') + -e 's;%OCTAVE_HOME%;\"${OCTAVE_HOME}\";' + -e 's;%OCTAVE_LIB_DIR%;\"${OCTAVE_LIB_DIR}\";') + -e 's;%OCTAVE_INFO_DIR%;\"${OCTAVE_INFO_DIR}\";' @$(srcdir)/move-if-change defaults.h.tmp defaults.h include $(MAKEDEPS)
--- a/src/defaults.h.in Mon May 23 20:50:51 1994 +0000 +++ b/src/defaults.h.in Mon May 23 21:04:55 1994 +0000 @@ -1,7 +1,7 @@ // defaults.h -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -21,8 +21,8 @@ */ -#if !defined (_defaults_h) -#define _defaults_h 1 +#if !defined (octave_defaults_h) +#define octave_defaults_h 1 #ifndef DEFAULT_PAGER #define DEFAULT_PAGER %DEFAULT_PAGER% @@ -32,6 +32,14 @@ #define OCTAVE_HOME %OCTAVE_HOME% #endif +#ifndef OCTAVE_LIB_DIR +#define OCTAVE_LIB_DIR %OCTAVE_LIB_DIR% +#endif + +#ifndef OCTAVE_INFO_DIR +#define OCTAVE_INFO_DIR %OCTAVE_INFO_DIR% +#endif + #endif /*