From: wolf Date: Thu, 29 Nov 2001 17:58:48 +0000 (+0000) Subject: Re: INCLUDE: X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91064ebefb9e72d20e465d242672d813e9264704;p=dealii-svn.git Re: INCLUDE: # do not take into account a possibly existing # environment variable, since the compiler will evaluate the value of # that anyway at compile time git-svn-id: https://svn.dealii.org/trunk@5314 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index afd16ca34b..0feb3c7e2e 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -93,7 +93,9 @@ ifeq ($(USE_CONTRIB_HSL),yes) endif -# include paths. add library paths to existing variable +# include paths. do not take into account a possibly existing +# environment variable, since the compiler will evaluate the value of +# that anyway at compile time include-path-base = $D/base/include include-path-lac = $D/lac/include @@ -101,10 +103,10 @@ include-path-deal2 = $D/deal.II/include include-path-contrib-hsl = $D/contrib/hsl/include -INCLUDE += $(addprefix -I, $(include-path-base) \ - $(include-path-lac) \ - $(include-path-deal2)\ - $(include-path-contrib-hsl)) +INCLUDE = $(addprefix -I, $(include-path-base) \ + $(include-path-lac) \ + $(include-path-deal2)\ + $(include-path-contrib-hsl)) # compiler flags for debug and optimized mode CXXFLAGS.g = @DEFS@ @CXXFLAGSG@ $(INCLUDE) diff --git a/deal.II/doc/news/2001/c-3-2.html b/deal.II/doc/news/2001/c-3-2.html index ecc5663991..42663f0237 100644 --- a/deal.II/doc/news/2001/c-3-2.html +++ b/deal.II/doc/news/2001/c-3-2.html @@ -26,6 +26,15 @@ documentation, etc.

General

    +
  1. Fixed: Previously, the $(INCLUDE) variable in Makefiles + included the values of the $INCLUDE environment variable. This + is not desirable, since the compiler evaluates that variable + anyway and the Makefile variable has -I prefixed + to all paths while the environment variable has not. +
    + (WB 2001/11/29) +

    +
  2. Removed: the option to generate printable documentation was removed. Since this comprised approximately 2000 pages and since we believe that the online documentation is rather good,