diff -Naur scidavis-0.2.4.org/fitPlugins/explin/explin.pro scidavis-0.2.4/fitPlugins/explin/explin.pro
--- scidavis-0.2.4.org/fitPlugins/explin/explin.pro 2009-05-30 17:35:08.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/explin/explin.pro 2010-03-13 19:53:19.899694554 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = explin
TEMPLATE = lib
@@ -9,13 +8,13 @@
DESTDIR = ../
INSTALLS += target
-unix: target.path = /usr/lib$${libsuff}/scidavis/plugins
+unix: target.path = $$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
win32:INCLUDEPATH += c:/gsl/include
win32:LIBS += c:/gsl/lib/libgsl.a
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
SOURCES = explin.c
diff -Naur scidavis-0.2.4.org/fitPlugins/exp_saturation/exp_saturation.pro scidavis-0.2.4/fitPlugins/exp_saturation/exp_saturation.pro
--- scidavis-0.2.4.org/fitPlugins/exp_saturation/exp_saturation.pro 2009-05-30 17:35:08.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/exp_saturation/exp_saturation.pro 2010-03-13 19:53:52.520687017 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = exp_saturation
TEMPLATE = lib
@@ -9,12 +8,12 @@
DESTDIR = ../
INSTALLS += target
-unix: target.path = /usr/lib$${libsuff}/scidavis/plugins
+unix: target.path = $$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
win32:INCLUDEPATH += c:/gsl/include
win32:LIBS += c:/gsl/lib/libgsl.a
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
SOURCES = exp_saturation.c
diff -Naur scidavis-0.2.4.org/fitPlugins/fitRational0/fitRational0.pro scidavis-0.2.4/fitPlugins/fitRational0/fitRational0.pro
--- scidavis-0.2.4.org/fitPlugins/fitRational0/fitRational0.pro 2009-04-09 14:26:11.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/fitRational0/fitRational0.pro 2010-03-13 19:54:25.156689749 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = fitRational0
TEMPLATE = lib
@@ -25,10 +24,10 @@
# Dynamically link against GSL installed system-wide.
# This is used as default on unix systems such as
# Linux, Mac OS X and *BSD.
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
# where to install the plugins
-unix:target.path=/usr/lib$${libsuff}/scidavis/plugins
+unix:target.path=$$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
SOURCES += fitRational0.cpp
diff -Naur scidavis-0.2.4.org/fitPlugins/fitRational1/fitRational1.pro scidavis-0.2.4/fitPlugins/fitRational1/fitRational1.pro
--- scidavis-0.2.4.org/fitPlugins/fitRational1/fitRational1.pro 2009-04-09 14:26:11.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/fitRational1/fitRational1.pro 2010-03-13 19:54:50.414685870 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = fitRational1
TEMPLATE = lib
@@ -25,10 +24,10 @@
# Dynamically link against GSL installed system-wide.
# This is used as default on unix systems such as
# Linux, Mac OS X and *BSD.
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
# where to install the plugins
-unix:target.path=/usr/lib$${libsuff}/scidavis/plugins
+unix:target.path=$$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
SOURCES += fitRational1.cpp
diff -Naur scidavis-0.2.4.org/fitPlugins/planck_wavelength/planck_wavelength.pro scidavis-0.2.4/fitPlugins/planck_wavelength/planck_wavelength.pro
--- scidavis-0.2.4.org/fitPlugins/planck_wavelength/planck_wavelength.pro 2009-05-30 17:44:16.000000000 +0800
+++ scidavis-0.2.4/fitPlugins/planck_wavelength/planck_wavelength.pro 2010-03-13 19:55:18.184687287 +0800
@@ -1,5 +1,4 @@
QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
TARGET = planck_wavelength
TEMPLATE = lib
@@ -9,13 +8,13 @@
DESTDIR = ../
INSTALLS += target
-unix: target.path = /usr/lib$${libsuff}/scidavis/plugins
+unix: target.path = $$INSTALLBASE/$$LIB/scidavis/plugins
win32: target.path = c:/scidavis/plugins
win32:INCLUDEPATH += c:/gsl/include
win32:LIBS += c:/gsl/lib/libgsl.a
-unix:LIBS += -L/usr/lib$${libsuff} -lgsl -lgslcblas
+unix:LIBS += -lgsl -lgslcblas
SOURCES = planck_wavelength.c