Skip to content
Snippets Groups Projects
Commit 8eda834d authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Fixes to make install.

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

(cherry picked from commit 9b5a0995)
parent f5897168
Branches
No related tags found
No related merge requests found
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) 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)
......
...@@ -10,7 +10,7 @@ DEFS += -DMEXEXT=\"$(MEXEXT)\" ...@@ -10,7 +10,7 @@ DEFS += -DMEXEXT=\"$(MEXEXT)\"
AM_LDFLAGS = $(MATLAB_LDFLAGS) AM_LDFLAGS = $(MATLAB_LDFLAGS)
LIBS += $(MATLAB_LIBS) LIBS += $(MATLAB_LIBS)
mexdir = $(DESTDIR)$(libdir)/dynare/mex/matlab mexdir = $(libdir)/dynare/mex/matlab
all-local: all-local:
$(MKDIR_P) $(top_srcdir)/../../matlab $(MKDIR_P) $(top_srcdir)/../../matlab
......
...@@ -17,7 +17,7 @@ LIBS += $(shell $(MKOCTFILE) -p FFTW_LIBS) ...@@ -17,7 +17,7 @@ LIBS += $(shell $(MKOCTFILE) -p FFTW_LIBS)
LIBS += $(shell $(MKOCTFILE) -p LIBS) LIBS += $(shell $(MKOCTFILE) -p LIBS)
LIBS += $(shell $(MKOCTFILE) -p FLIBS) LIBS += $(shell $(MKOCTFILE) -p FLIBS)
mexdir = $(DESTDIR)$(libdir)/dynare/mex/octave mexdir = $(libdir)/dynare/mex/octave
all-local: all-local:
$(MKDIR_P) $(top_srcdir)/../../octave $(MKDIR_P) $(top_srcdir)/../../octave
......
...@@ -2,7 +2,7 @@ SUBDIRS = macro ...@@ -2,7 +2,7 @@ SUBDIRS = macro
BUILT_SOURCES = DynareBison.hh stack.hh position.hh location.hh DynareBison.cc DynareFlex.cc FlexLexer.h 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 matlab_PROGRAMS = dynare_m
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment