# HG changeset patch # User John W. Eaton # Date 1358213196 18000 # Node ID 0de9c904bcf10650e19dae15714b62dde86baac6 # Parent 25eff7fe556dcccaf13ccc0f72f812111bca5539# Parent a86275134ffc17de1f5bcfe2cc35c36d636573b9 maint: periodic merge of stable to default diff -r 25eff7fe556d -r 0de9c904bcf1 doc/interpreter/mkoctfile.1 --- a/doc/interpreter/mkoctfile.1 Mon Jan 14 16:05:47 2013 -0500 +++ b/doc/interpreter/mkoctfile.1 Mon Jan 14 20:26:36 2013 -0500 @@ -95,29 +95,29 @@ Print configuration variable \fIVAR\fP. Recognized variables are: .RS .Vb - ALL_CFLAGS FFTW3F_LIBS - ALL_CXXFLAGS FLIBS - ALL_FFLAGS FPICFLAG - ALL_LDFLAGS INCFLAGS + ALL_CFLAGS FFTW3F_LDFLAGS + ALL_CXXFLAGS FFTW3F_LIBS + ALL_FFLAGS FLIBS + ALL_LDFLAGS FPICFLAG + AR INCFLAGS BLAS_LIBS LAPACK_LIBS CC LDFLAGS CFLAGS LD_CXX CPICFLAG LD_STATIC_FLAG CPPFLAGS LFLAGS CXX LIBOCTAVE - CXXFLAGS LIBOCTINTERP - CXXPICFLAG LIBS - DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS + CXXFLAGS LIBOCTINTERP + CXXPICFLAG LIBS + DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS DEPEND_FLAGS OCTAVE_LINK_DEPS - DL_LD OCT_LINK_DEPS - DL_LDFLAGS RDYNAMIC_FLAG - EXEEXT READLINE_LIBS - F77 SED - F77_INTEGER_8_FLAG XTRA_CFLAGS - FFLAGS XTRA_CXXFLAGS - FFTW3_LDFLAGS - FFTW3_LIBS - FFTW3F_LDFLAGS + DL_LD OCT_LINK_DEPS + DL_LDFLAGS RANLIB + EXEEXT RDYNAMIC_FLAG + F77 READLINE_LIBS + F77_INTEGER_8_FLAG SED + FFLAGS XTRA_CFLAGS + FFTW3_LDFLAGS XTRA_CXXFLAGS + FFTW3_LIBS .Ve .RE .TP diff -r 25eff7fe556d -r 0de9c904bcf1 scripts/pkg/pkg.m