]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Re: INCLUDE:
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 29 Nov 2001 17:58:48 +0000 (17:58 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Thu, 29 Nov 2001 17:58:48 +0000 (17:58 +0000)
# 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

deal.II/common/Make.global_options.in
deal.II/doc/news/2001/c-3-2.html

index afd16ca34bcbe8c6c67f238e988f483edcf0fb43..0feb3c7e2e0db118868a43861df240452f3f5eb5 100644 (file)
@@ -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)
index ecc5663991d7f40785c9f46061d7f6384431826e..42663f0237828144759e9d2caf944a20267bcfa8 100644 (file)
@@ -26,6 +26,15 @@ documentation, etc</a>.
 <h3>General</h3>
 
 <ol>
+  <li> <p> 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 <code>-I</code> prefixed
+       to all paths while the environment variable has not.
+       <br>
+       (WB 2001/11/29)
+       </p>
+
   <li> <p> 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,

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.