From 9ca3f7dd1855e447f23e4216fe22d95f39f61fb4 Mon Sep 17 00:00:00 2001 From: Christian Engwer <christi@dune-project.org> Date: Sun, 18 May 2008 22:14:17 +0000 Subject: [PATCH] add install rules for pc-file and dune.module to top-rules [[Imported from SVN: r5202]] --- Makefile.am | 8 +------- am/top-rules | 6 ++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index cacf831c5..a60137c76 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 5164 2008-04-21 14:08:28Z christi $ +# $Id: Makefile.am 5198 2008-05-15 16:13:23Z christi $ # we need the module file to be able to build via dunecontrol EXTRA_DIST=dune.module dune-common.m4 @@ -9,12 +9,6 @@ AUTOMAKE_OPTIONS = foreign 1.5 SUBDIRS = common lib doc bin m4 am -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = @DUNE_MOD_NAME@.pc - -moduledir = $(libdir)/dunecontrol/@DUNE_MOD_NAME@ -module_DATA = dune.module - # use configured compiler for "make distcheck" DISTCHECK_CONFIGURE_FLAGS = CXX="$(CXX)" CC="$(CC)" --enable-parallel=@ENABLE_PARALLEL@ MPICC="$(MPICC)" diff --git a/am/top-rules b/am/top-rules index f0f54553b..d6e93c45b 100644 --- a/am/top-rules +++ b/am/top-rules @@ -7,3 +7,9 @@ all-am: dependencies.m4 @DUNE_MOD_NAME@.m4: dune.module cd $(srcdir) && $(DUNECONTROL) --only=@DUNE_MOD_NAME@ m4create + +moduledir = $(libdir)/dunecontrol/@DUNE_MOD_NAME@ +module_DATA = dune.module + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = @DUNE_MOD_NAME@.pc -- GitLab