Mercurial > hg > octave-max

changeset 4108:63a5613cca00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-10-16 22:55:24 by jwe]
author jwe
date Wed, 16 Oct 2002 22:55:24 +0000
parents bf4f52245d11
children 6e20cac828cd
files libcruft/ChangeLog libcruft/Makefile.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in src/help.cc src/variables.cc
diffstat 8 files changed, 30 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,5 +1,8 @@
 2002-10-16  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Makefile.in (install): Don't bother with versions for $(SHLBIN)
+	files.
+
 	* slatec-err/xerrwd.f (XERRWD): Print msg(1:nmes), not just msg.
 
 2002-10-14  John W. Eaton  <jwe@bevo.che.wisc.edu>
--- a/libcruft/Makefile.in
+++ b/libcruft/Makefile.in
@@ -132,11 +132,9 @@
 	  rm -f $(octlibdir)/libcruft.$(SHLLIB); \
 	  $(LN_S) libcruft.$(SHLLIB_VER) $(octlibdir)/libcruft.$(SHLLIB); \
 	  if  test x$(SHLBIN) != x ; then \
-	    rm -f $(bindir)/libcruft.$(SHLBIN_VER); \
+	    rm -f $(bindir)/libcruft.$(SHLBIN); \
 	    $(INSTALL_PROGRAM) \
-	      libcruft.$(SHLBIN) $(bindir)/libcruft.$(SHLBIN_VER); \
-	    rm -f $(bindir)/libcruft.$(SHLBIN); \
-	    $(LN_S) libcruft.$(SHLBIN_VER) $(bindir)/libcruft.$(SHLBIN); \
+	      libcruft.$(SHLBIN) $(bindir)/libcruft.$(SHLBIN); \
 	  fi; \
 	fi
 
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-16  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (install-lib): Don't bother with versions for
+	$(SHLBIN) files.
+
 2002-10-16  Paul Kienzle <pkienzle@users.sf.net>
 
 	* Makefile.in (LIB_DEPS): Include $(LIBS).
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -249,11 +249,9 @@
 	  rm -f $(octlibdir)/liboctave.$(SHLLIB); \
 	  $(LN_S) liboctave.$(SHLLIB_VER) $(octlibdir)/liboctave.$(SHLLIB); \
 	  if  test x$(SHLBIN) != x ; then \
-	    rm -f $(bindir)/liboctave.$(SHLBIN_VER); \
+	    rm -f $(bindir)/liboctave.$(SHLBIN); \
 	    $(INSTALL_PROGRAM) \
-	      liboctave.$(SHLBIN) $(bindir)/liboctave.$(SHLBIN_VER); \
-	    rm -f $(bindir)/liboctave.$(SHLBIN); \
-	    $(LN_S) liboctave.$(SHLBIN_VER) $(bindir)/liboctave.$(SHLBIN); \
+	      liboctave.$(SHLBIN) $(bindir)/liboctave.$(SHLBIN); \
 	  fi; \
 	fi
 .PHONY: install-lib
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2002-10-16  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* help.cc (display_help_text): Quote output file name for Cygwin.
+
+	* Makefile.in (install-lib): Don't bother with versions for
+	$(SHLBIN) files.
+
+	* help.cc (display_help_text): Match zero or more comment
+	characters instead of one or more.
+
 	* Makefile.in (install-oct): Process files from $(DLD_DEF_FILES),
 	not $(DLD_SRC).  Look for them in current directory, not $(srcdir).
 
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -381,11 +381,9 @@
 	  rm -f $(octlibdir)/liboctinterp.$(SHLLIB); \
 	  $(LN_S) liboctinterp.$(SHLLIB_VER) $(octlibdir)/liboctinterp.$(SHLLIB); \
 	  if  test x$(SHLBIN) != x ; then \
-	      rm -f $(bindir)/liboctinterp.$(SHLBIN_VER); \
-	      $(INSTALL_PROGRAM) \
-	        liboctinterp.$(SHLBIN) $(bindir)/liboctinterp.$(SHLBIN_VER); \
-	      rm -f $(bindir)/liboctinterp.$(SHLBIN); \
-	      $(LN_S) liboctinterp.$(SHLBIN_VER) $(bindir)/liboctinterp.$(SHLBIN); \
+	    rm -f $(bindir)/liboctinterp.$(SHLBIN); \
+	    $(INSTALL_PROGRAM) \
+	      liboctinterp.$(SHLBIN) $(bindir)/liboctinterp.$(SHLBIN); \
 	  fi; \
 	fi
 .PHONY: install-lib
--- a/src/help.cc
+++ b/src/help.cc
@@ -613,7 +613,7 @@
 
       OSSTREAM buf;
 
-      buf << "sed -e 's/^[#%]+ *//' -e 's/^ *@/@/' | "
+      buf << "sed -e 's/^[#%]* *//' -e 's/^ *@/@/' | "
 	  << Vmakeinfo_prog
 	  << " -D \"VERSION " << OCTAVE_VERSION << "\""
 	  << " -D \"OCTAVEHOME " << OCTAVE_PREFIX << "\""
@@ -623,7 +623,7 @@
 	  << " --no-validate"
 	  << " --no-headers"
 	  << " --force"
-	  << " --output " << tmp_file_name
+	  << " --output \"" << tmp_file_name << "\""
 	  << " > /dev/null 2>&1"
 	  << OSSTREAM_ENDS;
 
--- a/src/variables.cc
+++ b/src/variables.cc
@@ -912,6 +912,11 @@
   if (show_functions)
     {
       pad_after += fbi_sym_tab->maybe_list
+	("*** dynamically linked functions:", pats,
+	 octave_stdout, show_verbose, symbol_record::DLD_FUNCTION,
+	 SYMTAB_ALL_SCOPES);
+
+      pad_after += fbi_sym_tab->maybe_list
 	("*** currently compiled functions:", pats,
 	 octave_stdout, show_verbose, symbol_record::USER_FUNCTION,
 	 SYMTAB_ALL_SCOPES);