blob: e7424f73fc63850f641c85b674604e69e9c5a01a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
https://bugs.gentoo.org/297536
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@
AC_PROG_CC
AC_PROG_AWK
AC_PROG_LN_S
+AM_PROG_AR
AC_PROG_RANLIB
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,7 +137,7 @@
$(INSTALL) -d $(DESTDIR)/$(pkgdatadir)/web/Style
$(INSTALL) -d $(DESTDIR)/$(pkgdatadir)/web/Javascripts
$(INSTALL) -d $(DESTDIR)/$(pkgdatadir)/web/Images
- $(INSTALL) -d $(DESTDIR)/$(pkgdatadir)/plugins
+ $(INSTALL) -d $(DESTDIR)/$(libdir)/eugene/plugins
$(INSTALL) -d $(DESTDIR)/$(pkgdatadir)/cfg
$(INSTALL) -d $(DESTDIR)/$(pkgdatadir)/models
$(INSTALL) -d $(DESTDIR)/$(pkgdatadir)/models/WAM
@@ -160,6 +160,6 @@
$(INSTALL) -m 644 $(srcdir)/web/Images/*jpg $(DESTDIR)/$(pkgdatadir)/web/Images
$(INSTALL) -m 644 $(srcdir)/cfg/*.obo $(DESTDIR)/$(pkgdatadir)/cfg
$(INSTALL) -m 644 $(srcdir)/cfg/*.par $(DESTDIR)/$(pkgdatadir)/cfg
- $(INSTALL) src/SensorPlugins/*/*.so $(DESTDIR)/$(pkgdatadir)/plugins
+ $(INSTALL) src/SensorPlugins/*/*.so $(DESTDIR)/$(libdir)/eugene/plugins
$(INSTALL) $(srcdir)/Procedures/Eval/egn_* $(DESTDIR)/$(pkgdatadir)/Procedures/Eval
$(INSTALL) $(srcdir)/Procedures/Get/egn_* $(DESTDIR)/$(pkgdatadir)/Procedures/Get
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@
SUBDIRS = Parametrization GDIF . SensorPlugins
-AM_CXXFLAGS = $(eugene_cxxflags) -DDEFAULT_EUGENE_DIR=\"${pkgdatadir}\"
+AM_CXXFLAGS = $(eugene_cxxflags) -DDEFAULT_EUGENE_DIR=\"${pkgdatadir}\" -DLIB_DIR=\"${libdir}\"
AM_CFLAGS =
bin_PROGRAMS = eugene
--- a/src/MSensor.cc
+++ b/src/MSensor.cc
@@ -97,7 +97,7 @@
std::string use_name;
if (!IsInitialized) {
- PluginsDir = (std::string)PAR.getC("eugene_dir")+"/"+PLUGINS_DIR+"/";
+ PluginsDir = (std::string)LIB_DIR+"/eugene/"+PLUGINS_DIR+"/";
// On r�cup�re les couples nom de sensor/priorit� du .par
PAR.ResetIter();
|
GitWeb
