Mercurial > hg > octave-lojdl
changeset 4301:309ef552d7c6
[project @ 2003-01-21 21:49:00 by jwe]
author | jwe |
---|---|
date | Tue, 21 Jan 2003 21:49:00 +0000 |
parents | a370ad9112dd |
children | ebc2d8e4968b |
files | ChangeLog Makeconf.in |
diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-01-21 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makeconf.in (MKOCTFILE_INCFLAGS): Skip -I$(includedir) if + $(includedir) is /usr/include. + 2003-01-16 Mumit Khan <khan@nanotech.wisc.edu> * Makeconf.in (SED): Export to subshells.
--- a/Makeconf.in +++ b/Makeconf.in @@ -282,8 +282,13 @@ canonical_host_type = @canonical_host_type@ # The -I flags to use for the mkoctfile script. -MKOCTFILE_INCFLAGS = \ - -I$(octincludedir) -I$(octincludedir)/octave -I$(includedir) +ifeq ($(includedir,/usr/include) + MKOCTFILE_INCFLAGS = \ + -I$(octincludedir) -I$(octincludedir)/octave +else + MKOCTFILE_INCFLAGS = \ + -I$(octincludedir) -I$(octincludedir)/octave -I$(includedir) +endif # The -L flags to use for the mkoctfile scrip (for --link-stand-alone) MKOCTFILE_LFLAGS = -L$(octlibdir)