From 8eda834dff6c2ced859dd437960ebc245bc1330d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Fri, 18 Jul 2014 12:15:36 +0200
Subject: [PATCH] Fixes to make install.

- fix DESTDIR for preprocessor and MEX files (it was duplicated)
- don't install libdynare++.a

(cherry picked from commit 9b5a09958c53371cea1e591ab36896ecd7483747)
---
 mex/build/libdynare++.am | 2 +-
 mex/build/matlab/mex.am  | 2 +-
 mex/build/octave/mex.am  | 2 +-
 preprocessor/Makefile.am | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mex/build/libdynare++.am b/mex/build/libdynare++.am
index 668ed89d7..b762f6550 100644
--- a/mex/build/libdynare++.am
+++ b/mex/build/libdynare++.am
@@ -1,4 +1,4 @@
-mex_LIBRARIES = libdynare++.a
+noinst_LIBRARIES = libdynare++.a
 
 libdynare___a_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources $(CPPFLAGS_MATIO)
 
diff --git a/mex/build/matlab/mex.am b/mex/build/matlab/mex.am
index 29eb2d81b..835b6c3bf 100644
--- a/mex/build/matlab/mex.am
+++ b/mex/build/matlab/mex.am
@@ -10,7 +10,7 @@ DEFS += -DMEXEXT=\"$(MEXEXT)\"
 AM_LDFLAGS = $(MATLAB_LDFLAGS)
 LIBS += $(MATLAB_LIBS)
 
-mexdir = $(DESTDIR)$(libdir)/dynare/mex/matlab
+mexdir = $(libdir)/dynare/mex/matlab
 
 all-local:
 	$(MKDIR_P) $(top_srcdir)/../../matlab
diff --git a/mex/build/octave/mex.am b/mex/build/octave/mex.am
index 6184ebc99..999f5b96d 100644
--- a/mex/build/octave/mex.am
+++ b/mex/build/octave/mex.am
@@ -17,7 +17,7 @@ LIBS += $(shell $(MKOCTFILE) -p FFTW_LIBS)
 LIBS += $(shell $(MKOCTFILE) -p LIBS)
 LIBS += $(shell $(MKOCTFILE) -p FLIBS)
 
-mexdir = $(DESTDIR)$(libdir)/dynare/mex/octave
+mexdir = $(libdir)/dynare/mex/octave
 
 all-local:
 	$(MKDIR_P) $(top_srcdir)/../../octave
diff --git a/preprocessor/Makefile.am b/preprocessor/Makefile.am
index 5976aac9a..94179229e 100644
--- a/preprocessor/Makefile.am
+++ b/preprocessor/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = macro
 
 BUILT_SOURCES = DynareBison.hh stack.hh position.hh location.hh DynareBison.cc DynareFlex.cc FlexLexer.h
 
-matlabdir = $(DESTDIR)$(pkglibdir)/matlab
+matlabdir = $(pkglibdir)/matlab
 
 matlab_PROGRAMS = dynare_m
 
-- 
GitLab