Mercurial > hg > octave-nkf

changeset 12772:c55df65b543a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
periodic merge of stable to default
author John W. Eaton <jwe@octave.org>
date Fri, 24 Jun 2011 11:42:54 -0400
parents 7b444ea41618 (current diff) 37c5cf08cfa0 (diff)
children ec6c52496485
files NEWS configure.ac src/Makefile.am
diffstat 3 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags
+++ b/.hgtags
@@ -50,3 +50,5 @@
 3cbc0d77db48aec32bcb202d09a036d2cb9cc3b9 ss-3-3-53
 bd2643f0ce57d070963bedd48857405f6924aa85 ss-3-3-54
 695141f1c05cf1b240592bdd18e7a1503bb2a539 ss-3-3-55
+901d466ee55ac902a875ec0ade6f1eccef0841dc release-3-4-1
+3666e8e6f96e6899b8306d6ea9614aadf0500d67 release-3-4-2
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,12 @@
       studentize
       sylvester_matrix
 
+Summary of important user-visible changes for version 3.4.2:
+-----------------------------------------------------------
+
+ ** Octave 3.2.4 fixes some minor installation problems that affected
+    version 3.4.1.
+
 Summary of important user-visible changes for version 3.4.1:
 -----------------------------------------------------------
 
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,9 +38,11 @@
 
 mkoctfile_SOURCES =
 nodist_mkoctfile_SOURCES = mkoctfile.cc
+mkoctfile_LDADD = ../libgnu/libgnu.la $(LIBS)
 
 octave_config_SOURCES =
 nodist_octave_config_SOURCES = octave-config.cc
+octave_config_LDADD = ../libgnu/libgnu.la $(LIBS)
 
 BUILT_SOURCES_EXTRA = \
   mkoctfile.cc \