Mercurial > octave-nkf
changeset 3659:e68976912bb5
[project @ 2000-04-19 16:43:56 by jwe]
| author | jwe |
|---|---|
| date | Wed, 19 Apr 2000 16:43:57 +0000 |
| parents | 808f399398c9 |
| children | 2dc265765850 |
| files | ChangeLog examples/oregonator.cc mkoctfile.in octMakefile.in |
| diffstat | 4 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 11 19:45:44 2000 +0000 +++ b/ChangeLog Wed Apr 19 16:43:57 2000 +0000 @@ -1,3 +1,11 @@ +2000-04-19 John W. Eaton <jwe@bevo.che.wisc.edu> + + * mkoctfile.in: Remove output file before linking. + + * octMakefile.in (DIRS_TO_MAKE): Create $(octincludedir)/octave. + (install install-strip): Install config.h in $(octincludedir)/octave, + not $(octincludedir). + 2000-03-31 John W. Eaton <jwe@bevo.che.wisc.edu> * octMakefile.in (DIRS_TO_MAKE): Double up on $ in awk command to
--- a/examples/oregonator.cc Tue Apr 11 19:45:44 2000 +0000 +++ b/examples/oregonator.cc Wed Apr 19 16:43:57 2000 +0000 @@ -12,7 +12,7 @@ { ColumnVector dx (3); - ColumnVector x = args(0).vector_value (); + ColumnVector x = args(0).column_vector_value (); dx(0) = 77.27 * (x(1) - x(0)*x(1) + x(0) - 8.375e-06*pow (x(0), 2)); dx(1) = (x(2) - x(0)*x(1) - x(1)) / 77.27;
--- a/mkoctfile.in Tue Apr 11 19:45:44 2000 +0000 +++ b/mkoctfile.in Wed Apr 19 16:43:57 2000 +0000 @@ -187,6 +187,9 @@ done fi +$dbg "rm -f $octfile" +rm -f $octfile + # Link all the object files. $dbg $SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags
--- a/octMakefile.in Tue Apr 11 19:45:44 2000 +0000 +++ b/octMakefile.in Wed Apr 19 16:43:57 2000 +0000 @@ -63,7 +63,7 @@ # Subdirectories in which to run clean targets. CLEANSUBDIRS = $(DISTSUBDIRS) @READLINE_DIR@ @GLOB_DIR@ kpathsea -DIRS_TO_MAKE = $(bindir) $(libdir) $(octincludedir) $(fcnfiledir) \ +DIRS_TO_MAKE = $(bindir) $(libdir) $(octincludedir)/octave $(fcnfiledir) \ $(octfiledir) $(archlibdir) $(localarchlibdir) \ `echo $(localfcnfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $$i}'` \ `echo $(localoctfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $$i}'` @@ -111,7 +111,7 @@ rm -f $(bindir)/mkoctfile $(INSTALL_SCRIPT) mkoctfile $(bindir)/mkoctfile-$(version) cd $(bindir); $(LN_S) mkoctfile-$(version) mkoctfile - $(INSTALL_DATA) config.h $(octincludedir)/config.h + $(INSTALL_DATA) config.h $(octincludedir)/octave/config.h $(mk-includedir-link) maintainer-clean::