diff src/Makefile.am @ 15262:ad1a980b0cb5

install default values before initializing interpreter (bug #37161) * octave.cc (octave_initialize_interpreter): Don't call install_defaults here. (octave_main): Call install_defaults here. * main.cc (main): Likewise. * main-cli.cc (main): Likewise. * src/Makefile.am (AM_CPPFLAGS): Include -I$(srcdir)/../libcruft/misc, -I$(srcdir)/../liboctave, and -I$(top_builddir)/libinterp/interpfcn in the list.
author John W. Eaton <jwe@octave.org>
date Thu, 30 Aug 2012 12:05:04 -0400
parents b241e69306a5
children 648dabbb4c6b
line wrap: on
line diff
--- a/src/Makefile.am	Thu Aug 30 15:53:07 2012 +0100
+++ b/src/Makefile.am	Thu Aug 30 12:05:04 2012 -0400
@@ -22,7 +22,10 @@
 
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
+  -I$(srcdir)/../libcruft/misc \
+  -I$(srcdir)/../liboctave \
   -I$(srcdir)/../libinterp \
+  -I$(top_builddir)/libinterp/interpfcn \
   -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
 
 OCTAVE_BINARIES = \