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
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
diff --git a/scidavis/scidavis.pro b/scidavis/scidavis.pro
index fa33d0e..0af10c6 100644
--- a/scidavis/scidavis.pro
+++ b/scidavis/scidavis.pro
@@ -33,7 +33,7 @@ exists(/usr/bin/lupdate-qt4) {
linux-g++-64: libsuff = 64
### where to install
-unix: INSTALLBASE = /usr # this is what is called "prefix" when using GNU autotools
+unix: INSTALLBASE = @GENTOO_PORTAGE_EPREFIX@/usr # this is what is called "prefix" when using GNU autotools
win32: INSTALLBASE = c:/scidavis
unix: target.path = "$$INSTALLBASE/bin" # where to install the binary on Linux/MacOS X
win32: target.path = "$$INSTALLBASE" # where to install the exe on Windows
@@ -56,7 +56,7 @@ win32: translationfiles.path = "$$INSTALLBASE/translations"
### scidavisrc.py and scidavisUtil.py, respectively. Alternatively you can also put scidavisrc.py
### (or ".scidavis.py") into the users home directory. scidavisUtil.py must be either in the
### directory specified here or somewhere else in the python path (sys.path) where "import" can find it
-unix: pythonconfig.path = /etc # where scidavisrc.py is installed
+unix: pythonconfig.path = $$INSTALLBASE/share/scidavis # where scidavisrc.py is installed
win32: pythonconfig.path = $$INSTALLBASE
unix: pythonutils.path = $$INSTALLBASE/share/scidavis # where the scidavisUtil python modules is installed
win32: pythonutils.path = $$INSTALLBASE
@@ -76,6 +76,7 @@ include( python.pri )
### instead of the one provided in "3rdparty", uncomment the following 2 lines:
# CONFIG += dynamic_liborigin
# LIBS += -lorigin
+# INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/liborigin2
### Unfortunately, due to liborigin being in alpha stage, we cannot promise
### that SciDAVis works with any other version that the one in "3rdparty".
################### end of liborigin block
@@ -87,16 +88,17 @@ include( python.pri )
### are compiled against Qt4), dynamically against everything else.
#############################################################################
-unix:INCLUDEPATH += ../3rdparty/qwtplot3d/include
-unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+unix:INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/qwtplot3d
+unix:LIBS += -lqwtplot3d
-unix:INCLUDEPATH += ../3rdparty/qwt/src
-unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
+unix:INCLUDEPATH += @GENTOO_PORTAGE_EPREFIX@/usr/include/qwt5
+unix:LIBS += -lqwt
-unix:LIBS += -L/usr/lib$${libsuff}
-unix:LIBS += -lgsl -lgslcblas -lz
-unix:LIBS += -lmuparser
-unix:INCLUDEPATH += /usr/include/muParser
+unix:INCLUDEPATH += $$system(pkg-config --cflags gsl)
+unix:LIBS += $$system(pkg-config --libs gsl)
+unix:LIBS += $$system(pkg-config --libs muparser)
+unix:INCLUDEPATH += $$system(pkg-config --cflags muparser)
+unix:LIBS += -lz
#############################################################################
### Link everything dynamically
diff --git a/scidavis/sourcefiles.pri b/scidavis/sourcefiles.pri
index 892b45f..bd349c6 100644
--- a/scidavis/sourcefiles.pri
+++ b/scidavis/sourcefiles.pri
@@ -48,12 +48,8 @@ contains( INSTALLS, translationfiles ){
###################### DOCUMENTATION ########################################
documentation.files += ../manual/html \
- ../INSTALL.html \
../scidavis.css \
- ../scidavis-logo.png \
- ../README \
- ../CHANGES \
- ../gpl.txt
+ ../scidavis-logo.png
###################### DESKTOP INTEGRATION ##################################
|
GitWeb
