From: young <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 27 Sep 2011 07:43:37 +0000 (+0000)
Subject: Simplify a test for PETSc libraries
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1aef71d1cb372248d2dad89d4653ac46fb1fda0;p=dealii-svn.git

Simplify a test for PETSc libraries

git-svn-id: https://svn.dealii.org/trunk@24448 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in
index 6c82ef56ea..98a333ad1b 100644
--- a/deal.II/common/Make.global_options.in
+++ b/deal.II/common/Make.global_options.in
@@ -174,7 +174,7 @@ ifeq ($(USE_CONTRIB_PETSC),yes)
         lib-contrib-petsc.g = $(shell echo $(DEAL_II_PETSC_DIR)/lib/$(DEAL_II_PETSC_ARCH)/*$(lib-suffix))
         lib-contrib-petsc.o = $(shell echo $(DEAL_II_PETSC_DIR)/lib/$(DEAL_II_PETSC_ARCH)/*$(lib-suffix))
       else
-        # which is the same for PETSc 3.0.0:
+        # which is the similar as for PETSc 3.0.0:
         ifeq ($(DEAL_II_PETSC_VERSION_MAJOR)$(DEAL_II_PETSC_VERSION_MINOR),30)
           lib-contrib-petsc.g = $(shell echo $(DEAL_II_PETSC_DIR)/$(DEAL_II_PETSC_ARCH)/lib/*$(lib-suffix))
           lib-contrib-petsc.o = $(shell echo $(DEAL_II_PETSC_DIR)/$(DEAL_II_PETSC_ARCH)/lib/*$(lib-suffix))
@@ -306,10 +306,8 @@ INCLUDE = -I$D/include \
 #
 # also, note that this only works for PETSc before 2.3 :-]
 ifeq ($(USE_CONTRIB_PETSC),yes)
-  ifeq ($(DEAL_II_PETSC_VERSION_MAJOR),2)
-    ifeq ($(DEAL_II_PETSC_VERSION_MINOR),2)
-      include $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH)/packages
-    endif
+  ifeq ($(DEAL_II_PETSC_VERSION_MAJOR)$(DEAL_II_PETSC_VERSION_MINOR),22)
+    include $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH)/packages
   endif
   INCLUDE += -I$(include-path-petsc) -I$(include-path-petsc-bmake)\
              $(MPI_INCLUDE)