From 9ac71292f5519105c12b63acff4adf64663d01f6 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Fri, 12 Aug 2011 13:45:59 +0000
Subject: [PATCH] Replace old-but-wrong paths 'dune-solvers' by correct
'dune/solvers'. Thanks to Elias Pipping for pointing this out
[[Imported from SVN: r4353]]
---
doc/Makefile.am | 2 +-
doc/doxygen/Makefile.am | 2 +-
dune/solvers/Makefile.am | 2 +-
dune/solvers/common/Makefile.am | 2 +-
dune/solvers/iterationsteps/Makefile.am | 2 +-
dune/solvers/norms/Makefile.am | 2 +-
dune/solvers/solvers/Makefile.am | 2 +-
dune/solvers/transferoperators/Makefile.am | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 15dbd787..53882131 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,7 +5,7 @@ CURDIR = doc
BASEDIR = ..
-docdir=$(datadir)/doc/dune-solvers
+docdir=$(datadir)/doc/dune/solvers
include $(top_srcdir)/am/webstuff
diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index e031ce3a..f3d80419 100644
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -3,7 +3,7 @@ BASEDIR=../..
CURDIR=doc/doxygen
WHAT=
-doxygendir = $(datadir)/doc/dune-solvers/doxygen
+doxygendir = $(datadir)/doc/dune/solvers/doxygen
doxygen_DATA = $(WHAT)
#we need this in the distribution
diff --git a/dune/solvers/Makefile.am b/dune/solvers/Makefile.am
index eca20b37..a700a0df 100644
--- a/dune/solvers/Makefile.am
+++ b/dune/solvers/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = common iterationsteps norms solvers transferoperators
-dune_solversdir = $(includedir)/dune/dune-solvers
+dune_solversdir = $(includedir)/dune/solvers
dune_solvers_HEADERS = computeenergy.hh
include $(top_srcdir)/am/global-rules
diff --git a/dune/solvers/common/Makefile.am b/dune/solvers/common/Makefile.am
index dfea333e..f93219a8 100644
--- a/dune/solvers/common/Makefile.am
+++ b/dune/solvers/common/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS =
-commondir = $(includedir)/dune/dune-solvers/common
+commondir = $(includedir)/dune/solvers/common
common_HEADERS = boxconstraint.hh \
genericvectortools.hh \
canignore.hh \
diff --git a/dune/solvers/iterationsteps/Makefile.am b/dune/solvers/iterationsteps/Makefile.am
index b18e7f47..3f306fc3 100644
--- a/dune/solvers/iterationsteps/Makefile.am
+++ b/dune/solvers/iterationsteps/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS =
-iterationstepsdir = $(includedir)/dune/dune-solvers/iterationsteps
+iterationstepsdir = $(includedir)/dune/solvers/iterationsteps
iterationsteps_HEADERS = amgstep.hh blockgsstep.hh blockgsstep.cc iterationstep.hh \
lineariterationstep.hh linegsstep.hh linegsstep.cc mmgstep.hh mmgstep.cc \
multigridstep.hh multigridstep.cc \
diff --git a/dune/solvers/norms/Makefile.am b/dune/solvers/norms/Makefile.am
index 2ec1e08d..cd74e773 100644
--- a/dune/solvers/norms/Makefile.am
+++ b/dune/solvers/norms/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS =
-normsdir = $(includedir)/dune/dune-solvers/norms
+normsdir = $(includedir)/dune/solvers/norms
norms_HEADERS = blocknorm.hh diagnorm.hh energynorm.hh fullnorm.hh h1seminorm.hh \
norm.hh pnorm.hh sumnorm.hh
diff --git a/dune/solvers/solvers/Makefile.am b/dune/solvers/solvers/Makefile.am
index 76962aec..798340a9 100644
--- a/dune/solvers/solvers/Makefile.am
+++ b/dune/solvers/solvers/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS =
-solversdir = $(includedir)/dune/dune-solvers/solvers
+solversdir = $(includedir)/dune/solvers/solvers
solvers_HEADERS = cgsolver.cc cgsolver.hh iterativesolver.cc iterativesolver.hh \
loopsolver.cc loopsolver.hh quadraticipopt.hh solver.hh \
tcgsolver.cc tcgsolver.hh
diff --git a/dune/solvers/transferoperators/Makefile.am b/dune/solvers/transferoperators/Makefile.am
index a486dab3..d5394ca1 100644
--- a/dune/solvers/transferoperators/Makefile.am
+++ b/dune/solvers/transferoperators/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS =
-transferoperatorsdir = $(includedir)/dune/dune-solvers/transferoperators
+transferoperatorsdir = $(includedir)/dune/solvers/transferoperators
transferoperators_HEADERS = compressedmultigridtransfer.hh multigridtransfer.hh \
truncatedcompressedmgtransfer.hh truncatedmgtransfer.hh densemultigridtransfer.hh \
mandelobsrestrictor.cc obstaclerestrictor.hh truncateddensemgtransfer.cc \
--
GitLab