Mercurial > hg > octave-max
changeset 2686:6d0a6fc92f06
[project @ 1997-02-14 22:31:36 by jwe]
| author | jwe |
|---|---|
| date | Fri, 14 Feb 1997 22:31:39 +0000 |
| parents | d347f197753f |
| children | 3e611118ce15 |
| files | ChangeLog install-octave kpathsea/Makefile.in libcruft/ChangeLog libcruft/Makefile.in liboctave/ChangeLog liboctave/Makefile.in readline/ChangeLog readline/Makefile.in src/ChangeLog src/Makefile.in |
| diffstat | 11 files changed, 63 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Fri Feb 14 14:07:08 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + * install-octave: Don't fail if LIBRARIES file is missing. + Don't try to install .oct files if there aren't any. + * octMakefile.in (bin-dist-type): Delete target. (binary-dist): Don't depend on bin-dist-type. Don't delete config.status or config.h here.
--- a/install-octave +++ b/install-octave @@ -214,32 +214,37 @@ cp info/info $archlibdir/info chmod 755 $archlibdir/info -echo "installing shared libraries in $libdir" -for f in `cat LIBRARIES` -do - file=`basename $f` - cp $f $libdir/$file - chmod 644 $libdir/$file -done - -echo "installing .oct files in $octfiledir" -cd src -for f in `find . -name '*.oct' -print` -do - file=`basename $f` - cp $f $octfiledir/$file - chmod 755 $octfiledir/$file -done -if test -f links-to-make; then - cat links-to-make | while read src dest +if test -f LIBRARIES; then + echo "installing shared libraries in $libdir" + for f in `cat LIBRARIES` do - if test -n "$src" && test -n "$dest"; then - cd $octfiledir - ln $src $dest - fi + file=`basename $f` + cp $f $libdir/$file + chmod 644 $libdir/$file done fi -cd $distdir + +oct_files=`find . -name '*.oct' -print` +if test -n "$oct_files"; then + echo "installing .oct files in $octfiledir" + cd src + for f in $oct_files + do + file=`basename $f` + cp $f $octfiledir/$file + chmod 755 $octfiledir/$file + done + if test -f links-to-make; then + cat links-to-make | while read src dest + do + if test -n "$src" && test -n "$dest"; then + cd $octfiledir + ln $src $dest + fi + done + fi + cd $distdir +fi echo "installing .m files in $fcnfiledir" cd scripts
--- a/kpathsea/Makefile.in +++ b/kpathsea/Makefile.in @@ -220,7 +220,9 @@ if [ -n "$(BINDISTFILES)" ]; then \ ln $(BINDISTFILES) ../`cat ../.fname`/kpathsea ; \ fi - echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES + if [ -n "$(BINDISTLIBS)" ]; then \ + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES ; \ + fi .PHONY: bin-dist ac_include ../make/config.make
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,7 @@ +Fri Feb 14 16:23:42 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): Don't write empty strings to LIBRARIES. + Thu Feb 13 17:33:41 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (stamp-shared): Use $(SH_LD) $(SH_LDFLAGS) instead
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -126,5 +126,7 @@ if [ -n "$(BINDISTFILES)" ]; then \ ln $(BINDISTFILES) ../`cat ../.fname`/libcruft ; \ fi - echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES + if [ -n "$(BINDISTLIBS)" ]; then \ + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES ; \ + fi .PHONY: bin-dist
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +Fri Feb 14 16:23:47 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): Don't write empty strings to LIBRARIES. + Thu Feb 13 14:35:19 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (stamp-prereq): Depend on stamp-picdir.
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -233,7 +233,9 @@ if [ -n "$(BINDISTFILES)" ]; then \ ln $(BINDISTFILES) ../`cat ../.fname`/liboctave ; \ fi - echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES + if [ -n "$(BINDISTLIBS)" ]; then \ + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES ; \ + fi .PHONY: bin-dist # If missing, GNU make attempts to create them in the reverse of the
--- a/readline/ChangeLog +++ b/readline/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 14 16:22:28 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): Don't write empty strings to LIBRARIES. + (bin-dist) (bin-dist): Don't write empty strings to LIBRARIES. + Thu Feb 13 13:50:21 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (stamp-history, stamp-readline): Use $(SH_LD)
--- a/readline/Makefile.in +++ b/readline/Makefile.in @@ -244,7 +244,9 @@ if [ -n "$(BINDISTFILES)" ]; then \ ln $(BINDISTFILES) ../`cat ../.fname`/readline ; \ fi - echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES + if [ -n "$(BINDISTLIBS)" ]; then \ + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES ; \ + fi .PHONY: bin-dist # Dependencies
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +Fri Feb 14 16:23:30 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in (bin-dist): Don't write empty strings to LIBRARIES. + Thu Feb 13 03:02:08 1997 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (stamp-prereq): Depend on stamp-picdir.
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -351,7 +351,9 @@ $(addprefix $(srcdir)/, $(DLD_SRC)) \ > ../`cat ../.fname`/src/links-to-make ; \ fi - echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES + if [ -n "$(BINDISTLIBS)" ]; then \ + echo $(BINDISTLIBS) >> ../`cat ../.fname`/LIBRARIES ; \ + fi .PHONY: bin-dist # Special rules -- these files need special things to be defined.