# HG changeset patch # User jwe # Date 855959499 0 # Node ID 6d0a6fc92f06a6721f457a1108f8d3a537ab0df2 # Parent d347f197753ff1f4d9064ddc8a4e37e3e10147fa [project @ 1997-02-14 22:31:36 by jwe] diff -r d347f197753f -r 6d0a6fc92f06 ChangeLog --- a/ChangeLog Fri Feb 14 22:10:34 1997 +0000 +++ b/ChangeLog Fri Feb 14 22:31:39 1997 +0000 @@ -1,5 +1,8 @@ Fri Feb 14 14:07:08 1997 John W. Eaton + * 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. diff -r d347f197753f -r 6d0a6fc92f06 install-octave --- a/install-octave Fri Feb 14 22:10:34 1997 +0000 +++ b/install-octave Fri Feb 14 22:31:39 1997 +0000 @@ -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 diff -r d347f197753f -r 6d0a6fc92f06 kpathsea/Makefile.in --- a/kpathsea/Makefile.in Fri Feb 14 22:10:34 1997 +0000 +++ b/kpathsea/Makefile.in Fri Feb 14 22:31:39 1997 +0000 @@ -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 diff -r d347f197753f -r 6d0a6fc92f06 libcruft/ChangeLog --- a/libcruft/ChangeLog Fri Feb 14 22:10:34 1997 +0000 +++ b/libcruft/ChangeLog Fri Feb 14 22:31:39 1997 +0000 @@ -1,3 +1,7 @@ +Fri Feb 14 16:23:42 1997 John W. Eaton + + * Makefile.in (bin-dist): Don't write empty strings to LIBRARIES. + Thu Feb 13 17:33:41 1997 John W. Eaton * Makefile.in (stamp-shared): Use $(SH_LD) $(SH_LDFLAGS) instead diff -r d347f197753f -r 6d0a6fc92f06 libcruft/Makefile.in --- a/libcruft/Makefile.in Fri Feb 14 22:10:34 1997 +0000 +++ b/libcruft/Makefile.in Fri Feb 14 22:31:39 1997 +0000 @@ -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 diff -r d347f197753f -r 6d0a6fc92f06 liboctave/ChangeLog --- a/liboctave/ChangeLog Fri Feb 14 22:10:34 1997 +0000 +++ b/liboctave/ChangeLog Fri Feb 14 22:31:39 1997 +0000 @@ -1,3 +1,7 @@ +Fri Feb 14 16:23:47 1997 John W. Eaton + + * Makefile.in (bin-dist): Don't write empty strings to LIBRARIES. + Thu Feb 13 14:35:19 1997 John W. Eaton * Makefile.in (stamp-prereq): Depend on stamp-picdir. diff -r d347f197753f -r 6d0a6fc92f06 liboctave/Makefile.in --- a/liboctave/Makefile.in Fri Feb 14 22:10:34 1997 +0000 +++ b/liboctave/Makefile.in Fri Feb 14 22:31:39 1997 +0000 @@ -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 diff -r d347f197753f -r 6d0a6fc92f06 readline/ChangeLog --- a/readline/ChangeLog Fri Feb 14 22:10:34 1997 +0000 +++ b/readline/ChangeLog Fri Feb 14 22:31:39 1997 +0000 @@ -1,3 +1,8 @@ +Fri Feb 14 16:22:28 1997 John W. Eaton + + * 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 * Makefile.in (stamp-history, stamp-readline): Use $(SH_LD) diff -r d347f197753f -r 6d0a6fc92f06 readline/Makefile.in --- a/readline/Makefile.in Fri Feb 14 22:10:34 1997 +0000 +++ b/readline/Makefile.in Fri Feb 14 22:31:39 1997 +0000 @@ -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 diff -r d347f197753f -r 6d0a6fc92f06 src/ChangeLog --- a/src/ChangeLog Fri Feb 14 22:10:34 1997 +0000 +++ b/src/ChangeLog Fri Feb 14 22:31:39 1997 +0000 @@ -1,3 +1,7 @@ +Fri Feb 14 16:23:30 1997 John W. Eaton + + * Makefile.in (bin-dist): Don't write empty strings to LIBRARIES. + Thu Feb 13 03:02:08 1997 John W. Eaton * Makefile.in (stamp-prereq): Depend on stamp-picdir. diff -r d347f197753f -r 6d0a6fc92f06 src/Makefile.in --- a/src/Makefile.in Fri Feb 14 22:10:34 1997 +0000 +++ b/src/Makefile.in Fri Feb 14 22:31:39 1997 +0000 @@ -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.