Fixes to make install.

- fix DESTDIR for preprocessor and MEX files (it was duplicated)
- don't install libdynare++.a
time-shift
Sébastien Villemot 2014-07-18 12:15:36 +02:00
parent 49e53f9299
commit 9b5a09958c
4 changed files with 4 additions and 4 deletions

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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