diff -ur qtiplot-0.8.9.orig/qtiplot/qtiplot.pro qtiplot-0.8.9/qtiplot/qtiplot.pro
--- qtiplot-0.8.9.orig/qtiplot/qtiplot.pro	2007-04-01 14:41:30 +0400
+++ qtiplot-0.8.9/qtiplot/qtiplot.pro	2007-04-06 12:33:00 +0400
@@ -18,7 +18,7 @@
 #!!! Warning: You must modify these paths according to your computer settings
 ############################################################################# 
 
-unix:LIBS         +=  /usr/lib/qt3/lib$${libsuff}/libqassistantclient.a
+unix:LIBS         +=  -lqassistantclient
 
 ############################################################################# 
 ##################### 3rd PARTY HEADER FILES SECTION ########################
@@ -26,9 +26,6 @@
 #############################################################################
 
 INCLUDEPATH       += ../3rdparty/qwt/src
-INCLUDEPATH       += ../3rdparty/qwtplot3d/include
-INCLUDEPATH		  += ../3rdparty/liborigin
-unix:INCLUDEPATH  += ../3rdparty/gsl/include
 win32:INCLUDEPATH += ../3rdparty/WinGSL
 INCLUDEPATH       += ../3rdparty/zlib123/include
 
@@ -39,11 +36,11 @@
 
 ##################### Linux (Mac OS X) ###################################### 
 
-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+unix:LIBS         += -lqwtplot3d
 unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
-unix:LIBS         += ../3rdparty/liborigin/liborigin.a
-unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
-unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+unix:LIBS         += -lorigin
+unix:LIBS         += -lgsl
+unix:LIBS         += -lgslcblas
 
 unix:target.path=/usr/bin
 unix:INSTALLS += target
diff -ur qtiplot-0.8.9.orig/qtiplot/src/bars.cpp qtiplot-0.8.9/qtiplot/src/bars.cpp
--- qtiplot-0.8.9.orig/qtiplot/src/bars.cpp	2006-05-05 02:17:36 +0400
+++ qtiplot-0.8.9/qtiplot/src/bars.cpp	2007-04-01 15:15:08 +0400
@@ -1,7 +1,7 @@
 #include <qbitmap.h>
 
-#include <qwt3d_color.h>
-#include <qwt3d_plot.h>
+#include <qwtplot3d/qwt3d_color.h>
+#include <qwtplot3d/qwt3d_plot.h>
 #include "bars.h"
 
 using namespace Qwt3D;
diff -ur qtiplot-0.8.9.orig/qtiplot/src/bars.h qtiplot-0.8.9/qtiplot/src/bars.h
--- qtiplot-0.8.9.orig/qtiplot/src/bars.h	2006-05-05 02:17:36 +0400
+++ qtiplot-0.8.9/qtiplot/src/bars.h	2007-04-01 15:15:15 +0400
@@ -1,7 +1,7 @@
 #ifndef BARS_H
 #define BARS_H
 
-#include <qwt3d_plot.h>
+#include <qwtplot3d/qwt3d_plot.h>
 
 class Bar : public Qwt3D::VertexEnrichment
 {
diff -ur qtiplot-0.8.9.orig/qtiplot/src/cones.cpp qtiplot-0.8.9/qtiplot/src/cones.cpp
--- qtiplot-0.8.9.orig/qtiplot/src/cones.cpp	2006-05-05 02:17:36 +0400
+++ qtiplot-0.8.9/qtiplot/src/cones.cpp	2007-04-01 15:17:10 +0400
@@ -1,6 +1,6 @@
 #include <math.h>
-#include "qwt3d_color.h"
-#include "qwt3d_plot.h"
+#include <qwtplot3d/qwt3d_color.h>
+#include <qwtplot3d/qwt3d_plot.h>
 #include "cones.h"
 
 using namespace Qwt3D;
diff -ur qtiplot-0.8.9.orig/qtiplot/src/cones.h qtiplot-0.8.9/qtiplot/src/cones.h
--- qtiplot-0.8.9.orig/qtiplot/src/cones.h	2006-05-05 02:17:36 +0400
+++ qtiplot-0.8.9/qtiplot/src/cones.h	2007-04-01 15:15:35 +0400
@@ -1,7 +1,7 @@
 #ifndef MYCONES_H
 #define MYCONES_H
 
-#include <qwt3d_plot.h>
+#include <qwtplot3d/qwt3d_plot.h>
 
 class Cone3D : public Qwt3D::VertexEnrichment
 {
diff -ur qtiplot-0.8.9.orig/qtiplot/src/graph3D.cpp qtiplot-0.8.9/qtiplot/src/graph3D.cpp
--- qtiplot-0.8.9.orig/qtiplot/src/graph3D.cpp	2007-01-08 16:36:54 +0300
+++ qtiplot-0.8.9/qtiplot/src/graph3D.cpp	2007-04-01 15:15:55 +0400
@@ -12,12 +12,12 @@
 #include <qclipboard.h>
 #include <qdragobject.h> 
 
-#include <qwt3d_surfaceplot.h>
-#include <qwt3d_function.h>
-#include <qwt3d_io.h>
-#include <qwt3d_io_gl2ps.h>
-#include <qwt3d_io_reader.h>
-#include <qwt3d_coordsys.h>
+#include <qwtplot3d/qwt3d_surfaceplot.h>
+#include <qwtplot3d/qwt3d_function.h>
+#include <qwtplot3d/qwt3d_io.h>
+#include <qwtplot3d/qwt3d_io_gl2ps.h>
+#include <qwtplot3d/qwt3d_io_reader.h>
+#include <qwtplot3d/qwt3d_coordsys.h>
 
 #include <gsl/gsl_vector.h>
 #include <math.h>
diff -ur qtiplot-0.8.9.orig/qtiplot/src/graph3D.h qtiplot-0.8.9/qtiplot/src/graph3D.h
--- qtiplot-0.8.9.orig/qtiplot/src/graph3D.h	2007-01-08 16:36:54 +0300
+++ qtiplot-0.8.9/qtiplot/src/graph3D.h	2007-04-01 15:14:00 +0400
@@ -3,8 +3,8 @@
 
 #include <qtimer.h> 
 
-#include <qwt3d_surfaceplot.h>
-#include <qwt3d_function.h> 
+#include <qwtplot3d/qwt3d_surfaceplot.h>
+#include <qwtplot3d/qwt3d_function.h> 
 
 #include "worksheet.h"
 #include "matrix.h"
diff -ur qtiplot-0.8.9.orig/qtiplot/src/importOPJ.cpp qtiplot-0.8.9/qtiplot/src/importOPJ.cpp
--- qtiplot-0.8.9.orig/qtiplot/src/importOPJ.cpp	2007-01-17 10:42:59 +0300
+++ qtiplot-0.8.9/qtiplot/src/importOPJ.cpp	2007-04-06 12:02:22 +0400
@@ -1,5 +1,5 @@
 #include "importOPJ.h"
-#include <OPJFile.h>
+#include <liborigin/OPJFile.h>
 
 #include <qregexp.h>
 
diff -ur qtiplot-0.8.9.orig/qtiplot/src/plot3DDialog.cpp qtiplot-0.8.9/qtiplot/src/plot3DDialog.cpp
--- qtiplot-0.8.9.orig/qtiplot/src/plot3DDialog.cpp	2006-09-22 02:15:31 +0400
+++ qtiplot-0.8.9/qtiplot/src/plot3DDialog.cpp	2007-04-01 15:16:14 +0400
@@ -31,7 +31,7 @@
 #include <qwidgetstack.h>
 #include <qfiledialog.h>
 
-#include <qwt3d_color.h> 
+#include <qwtplot3d/qwt3d_color.h> 
 
 using namespace Qwt3D;
 
diff -ur qtiplot-0.8.9.orig/qtiplot/src/plot3DDialog.h qtiplot-0.8.9/qtiplot/src/plot3DDialog.h
--- qtiplot-0.8.9.orig/qtiplot/src/plot3DDialog.h	2006-09-22 02:15:31 +0400
+++ qtiplot-0.8.9/qtiplot/src/plot3DDialog.h	2007-04-01 15:16:20 +0400
@@ -7,7 +7,7 @@
 #include <qstring.h>
 #include <qcheckbox.h>
 
-#include <qwt3d_color.h> 
+#include <qwtplot3d/qwt3d_color.h> 
 
 #include "graph3D.h"