Mercurial > octave-nkf
changeset 4414:f071adceaa04
[project @ 2003-05-16 20:11:35 by jwe]
| author | jwe |
|---|---|
| date | Fri, 16 May 2003 20:11:35 +0000 |
| parents | 2de7c7452a1e |
| children | ed8c4aaa8648 |
| files | ChangeLog Makeconf.in octMakefile.in |
| diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 14 22:28:18 2003 +0000 +++ b/ChangeLog Fri May 16 20:11:35 2003 +0000 @@ -1,3 +1,9 @@ +2003-05-16 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makeconf.in (NO_OCT_FILE_STRIP): Use -C arg for make. + + * octMakefile.in (DIRS_TO_MAKE): Use $(shell ...) instead of `...`. + 2003-05-14 John W. Eaton <jwe@bevo.che.wisc.edu> * Makeconf.in, octMakefile.in, emacs/Makefile.in,
--- a/Makeconf.in Wed May 14 22:28:18 2003 +0000 +++ b/Makeconf.in Fri May 16 20:11:35 2003 +0000 @@ -355,7 +355,7 @@ @mv $@-t $@ define do-subdir-for-command -echo making $@ in $d; cd $d; $(MAKE) $@; cd ..; +echo making $@ in $d; $(MAKE) -C $d $@; endef define subdir-for-command
--- a/octMakefile.in Wed May 14 22:28:18 2003 +0000 +++ b/octMakefile.in Fri May 16 20:11:35 2003 +0000 @@ -66,8 +66,9 @@ 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}'` + $(localfcnfilepathdirs) $(localoctfilepathdirs) \ + $(shell echo $(localfcnfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $$i}') \ + $(shell echo $(localoctfilepath) | awk -F: '{for (i=1; i<=NF; i++) print $$i}') all: octave-bug octave-config mkoctfile src .PHONY: all