[Merge][CMake] Merged revisions : 1790

Revision  r1790
.----------------------
distribute files needed by cmake with autotools-generated tarballs
.----------------------


[[Imported from SVN: r1864]]

Makefile.am

 # $Id$
 
 # we need the module file to be able to build via dunecontrol
-EXTRA_DIST= CMakeLists.txt dune.module
+EXTRA_DIST= CMakeLists.txt dune.module dune-istl-config.cmake.in  dune-istl-version.cmake.in
 
 # don't follow the full GNU-standard
 # need automake >= 1.5
@@ -15,3 +15,7 @@ DISTCHECK_CONFIGURE_FLAGS = --with-dune-common="$(DUNE_COMMON_ROOT)" CXX="$(CXX)
 
 include $(top_srcdir)/am/global-rules
 include $(top_srcdir)/am/top-rules
+
+# Distribute and install config.h.cmake
+configdir = $(datadir)/dune-istl
+dist_config_DATA = config.h.cmake

cmake/modules/Makefile.am

@@ -2,7 +2,7 @@ MODULES = DuneIstlMacros.cmake \
  FindSuperLU.cmake
 
 modulesdir= $(datadir)/cmake/modules
-modules_DATA = ${MODULES}
+dist_modules_DATA = ${MODULES}
 
 include $(top_srcdir)/am/global-rules
 

cmake/pkg/Makefile.am

+EXTRA_DIST = dune-istl-config.cmake.in