--- configure.ac.orig	2011-12-14 04:27:33.295324676 -0500
+++ configure.ac	2011-12-14 04:27:55.796927023 -0500
@@ -422,7 +422,7 @@
   HAVE_FTGL=yes
   HAVE_FTGL_INC=yes
   CPPFLAGS="-I$ftgl/include $CPPFLAGS";
-  AC_CHECK_HEADER( [FTGL/FTGL.h], [], [HAVE_FTGL_INC=no] )
+  AC_CHECK_HEADER( [FTGL/ftgl.h], [], [HAVE_FTGL_INC=no] )
   if test "x$HAVE_FTGL_INC" = "xyes"; then
     CSF_FTGL_INCLUDES="-I$ftgl/include/FTGL"
     HAVE_FTGL_LIB=yes
@@ -433,7 +433,7 @@
     #we have problem with unresolved symbols on 64 stations
     CSF_FTGL_LIB="-L$ftgl/lib -lftgl"
     AC_TRY_LINK([
-#include <FTGL/FTGL.h>
+#include <FTGL/ftgl.h>
 #include <FTGL/FTGLTextureFont.h>
 ], [
 FTGLTextureFont font("");], [
@@ -626,18 +626,18 @@
   HAVE_QT=yes
   HAVE_QT_INC=yes
   if test "x$qt" != "x"; then
-    CPPFLAGS="-I$qt/include/QtGui -I$qt/include/QtCore -I$qt/include/Qt -I$qt/include $CPPFLAGS";
+    CPPFLAGS="-I$qt/include/qt4/QtGui -I$qt/include/qt4/QtCore -I$qt/include/qt4/Qt -I$qt/include/qt4 $CPPFLAGS";
   else
     AC_MSG_NOTICE("--with-qt key is not defined")
   fi
   AC_CHECK_HEADER( [Qt/qpixmap.h], [], [HAVE_QT_INC=no] )
   if test "x$HAVE_QT_INC" = "xyes"; then
-    CSF_QT_INCLUDES="-I$qt/include/QtGui -I$qt/include/QtCore -I$qt/include/Qt -I$qt/include"
+    CSF_QT_INCLUDES="-I$qt/include/qt4/QtGui -I$qt/include/qt4/QtCore -I$qt/include/qt4/Qt -I$qt/include/qt4"
     HAVE_QT_LIB=yes
     AC_MSG_CHECKING([for connect in -lQtGui])
-    LDFLAGS="-L$qt/lib $LDFLAGS"
+    LDFLAGS="-L$qt/libqt4 $LDFLAGS"
     LIBS="$CSF_OpenGlLibs_LIB $LIBS"
-    AC_CHECK_LIB( [QtGui], [connect], [CSF_QT_LIB="-L$qt/lib -lQtGui -lQtCore"], [HAVE_QT_LIB=no] )
+    AC_CHECK_LIB( [QtGui], [connect], [CSF_QT_LIB="-L$qt/lib/qt4 -lQtGui -lQtCore"], [HAVE_QT_LIB=no] )
   fi
   if test "xno" = "x$HAVE_QT_LIB"; then
     HAVE_QT=no
--- env_DRAW.sh.orig	2011-12-14 04:12:28.607518581 -0500
+++ env_DRAW.sh	2011-12-14 04:31:21.759154926 -0500
@@ -1,7 +1,7 @@
 #!/bin/sh -f
 
-export CASROOT="LOCATION OF OCCT"
-export OCCT3RDPARTY="LOCATION OF OCCT3RDPARTY"
+export CASROOT="/usr"
+export OCCT3RDPARTY="/usr"
 
 export TCLHOME=$OCCT3RDPARTY/tcltk
 export FTGLDIR=$OCCT3RDPARTY/ftgl
@@ -10,29 +10,29 @@
 export TBBBIN=$OCCT3RDPARTY/tbb/bin
 export TBBLIB=$OCCT3RDPARTY/tbb/lib
 
-export CSF_MDTVFontDirectory=$CASROOT/src/FontMFT
+export CSF_MDTVFontDirectory=$CASROOT/include/opencascade/FontMFT
 export CSF_LANGUAGE=us
 export MMGT_CLEAR=1
 export CSF_EXCEPTION_PROMPT=1
-export CSF_SHMessage=$CASROOT/src/SHMessage
-export CSF_MDTVTexturesDirectory=$CASROOT/src/Textures
-export CSF_XSMessage=$CASROOT/src/XSMessage
-export CSF_StandardDefaults=$CASROOT/src/StdResource
-export CSF_PluginDefaults=$CASROOT/src/StdResource
-export CSF_XCAFDefaults=$CASROOT/src/StdResource
-export CSF_StandardLiteDefaults=$CASROOT/src/StdResource
-export CSF_GraphicShr=$CASROOT/lin/lib/libTKOpenGl.so
-export CSF_UnitsLexicon=$CASROOT/src/UnitsAPI/Lexi_Expr.dat
-export CSF_UnitsDefinition=$CASROOT/src/UnitsAPI/Units.dat
-export CSF_IGESDefaults=$CASROOT/src/XSTEPResource
-export CSF_STEPDefaults=$CASROOT/src/XSTEPResource
-export CSF_XmlOcafResource=$CASROOT/src/XmlOcafResource
-export CSF_MIGRATION_TYPES=$CASROOT/src/StdResource/MigrationSheet.txt
+export CSF_SHMessage=$CASROOT/include/opencascade/SHMessage
+export CSF_MDTVTexturesDirectory=$CASROOT/include/opencascade/Textures
+export CSF_XSMessage=$CASROOT/include/opencascade/XSMessage
+export CSF_StandardDefaults=$CASROOT/include/opencascade/StdResource
+export CSF_PluginDefaults=$CASROOT/include/opencascade/StdResource
+export CSF_XCAFDefaults=$CASROOT/include/opencascade/StdResource
+export CSF_StandardLiteDefaults=$CASROOT/include/opencascade/StdResource
+export CSF_GraphicShr=$CASROOT/lib/libTKOpenGl.so
+export CSF_UnitsLexicon=$CASROOT/include/opencascade/UnitsAPI/Lexi_Expr.dat
+export CSF_UnitsDefinition=$CASROOT/include/opencascade/UnitsAPI/Units.dat
+export CSF_IGESDefaults=$CASROOT/include/opencascade/XSTEPResource
+export CSF_STEPDefaults=$CASROOT/include/opencascade/XSTEPResource
+export CSF_XmlOcafResource=$CASROOT/include/opencascade/XmlOcafResource
+export CSF_MIGRATION_TYPES=$CASROOT/include/opencascade/StdResource/MigrationSheet.txt
 
 export TCL_LIBRARY=$TCLHOME/tcl8.5
 export TK_LIBRARY=$TCLHOME/tk8.5
 export TCLX_LIBRARY=$TCLHOME/tclx8.4
 export TCLLIBPATH="$TCLHOME/bin $TCLHOME/lib $TCL_LIBRARY $TK_LIBRARY $TCLX_LIBRARY"
 
-export PATH=$TCLHOME/bin:$FTGLDIR/bin:$GL2PSDIR/bin:$FREEIMAGEDIR/bin:$TBBBIN:$CASROOT/lin/bin:$PATH
-export LD_LIBRARY_PATH=$TCLHOME/lib:$FTGLDIR/lib:$GL2PSDIR/lib:$FREEIMAGEDIR/lib:$TBBLIB:$CASROOT/lin/lib:$LD_LIBRARY_PATH
+export PATH=$TCLHOME/bin:$FTGLDIR/bin:$GL2PSDIR/bin:$FREEIMAGEDIR/bin:$TBBBIN:$CASROOT/bin:$PATH
+export LD_LIBRARY_PATH=$TCLHOME/lib:$FTGLDIR/lib:$GL2PSDIR/lib:$FREEIMAGEDIR/lib:$TBBLIB:$CASROOT/lib:$LD_LIBRARY_PATH
--- inc/OpenGl_FontMgr.hxx.orig	2011-12-14 05:24:31.299152991 -0500
+++ inc/OpenGl_FontMgr.hxx	2011-12-14 05:25:17.808983192 -0500
@@ -6,7 +6,7 @@
 # include <stdlib.h>
 #endif
 
-#include <FTFont.h>
+#include <FTGL/ftgl.h>
 
 #include <InterfaceGraphic.hxx>
 #include <TCollection_HAsciiString.hxx>
--- src/OpenGl/OpenGl_FontMgr.hxx.orig	2011-12-14 05:00:54.810345006 -0500
+++ src/OpenGl/OpenGl_FontMgr.hxx	2011-12-14 05:01:30.695703487 -0500
@@ -6,7 +6,7 @@
 # include <stdlib.h>
 #endif
 
-#include <FTFont.h>
+#include <FTGL/ftgl.h>
 
 #include <InterfaceGraphic.hxx>
 #include <TCollection_HAsciiString.hxx>
--- src/OpenGl/OpenGl_FontMgr.cxx.orig	2011-12-14 05:01:47.027315391 -0500
+++ src/OpenGl/OpenGl_FontMgr.cxx	2011-12-14 05:02:32.616002631 -0500
@@ -1,8 +1,8 @@
 #include <OpenGl_FontMgr.hxx>
 
-#include <FTGLTextureFont.h>        
-#include <FTLibrary.h>
-#include <FTFace.h>
+#include <FTGL/FTGLTextureFont.h>
+#include <FTGL/FTLibrary.h>
+#include <FTGL/FTFace.h>
 #include <Standard_Stream.hxx>
 
 #undef TRACE
--- inc/OpenGl_TextRender.hxx.orig	2011-12-14 05:35:11.250912898 -0500
+++ inc/OpenGl_TextRender.hxx	2011-12-14 05:35:22.816550638 -0500
@@ -5,7 +5,7 @@
 #include <NCollection_DataMap.hxx>
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
-#include <FTFont.h>
+#include <FTGL/FTFont.h>
 
 #define NUM_FONT_SIZES 40
 #define NUM_CHAR_FONT 1024
--- Makefile.am.orig	2011-12-15 04:56:04.362637843 -0500
+++ Makefile.am	2011-12-15 06:29:01.307312464 -0500
@@ -86,46 +86,27 @@
 dir_SunOS=sun
 
 install-exec-local:
-	$(INSTALL) -d $(prefix)/$(platform)
-	if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \
-		cd $(prefix)/$(platform) && ln -s ../bin bin; \
-	fi
-	if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \
-		cd $(prefix)/$(platform) && ln -s ../lib lib; \
-	fi
-	$(INSTALL) -d $(prefix)/$(dir_$(platform))
-	if [ -e $(prefix)/bin -a ! -e $(prefix)/$(dir_$(platform))/bin ]; then \
-		cd $(prefix)/$(dir_$(platform)) && ln -s ../bin bin; \
-	fi
-	if [ -e $(prefix)/lib -a ! -e $(prefix)/$(dir_$(platform))/lib ]; then \
-		cd $(prefix)/$(dir_$(platform)) && ln -s ../lib lib; \
-	fi
+	$(INSTALL) -d $(prefix)	
 	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
 	if [ "$$pd" != "$$sd" ]; then \
-		$(INSTALL) -d $(prefix)/inc; \
-		cp -fr$(CP_$(platform)) $(top_srcdir)/inc $(prefix); \
+		$(INSTALL) -d $(prefix)/include; \
+		cp -fr $(top_srcdir)/inc $(prefix)/include/opencascade; \
 	fi; \
 	if [ "$$pd" != "$$bd" ]; then \
-		cp -fr$(CP_$(platform)) $$bd/config.h $(prefix); \
-	fi
-	if [ -e $(prefix)/inc/config.h ]; then \
-		unlink $(prefix)/inc/config.h; \
+		cp -fr $$bd/config.h $(prefix)/include/opencascade; \
 	fi
-	cd $(prefix)/inc && ln -s ../config.h config.h 
 	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
 	if [ "$$pd" != "$$sd" -a -d $(top_srcdir)/src/UnitsAPI ]; then \
-		$(INSTALL) -d $(prefix)/src; \
-		$(INSTALL) -d $(prefix)/src/UnitsAPI; \
-		cp -fr$(CP_$(platform)) $(top_srcdir)/src/UnitsAPI $(prefix)/src; \
-		cp -f$(CP_$(platform)) $(top_srcdir)/env_DRAW.sh $(prefix); \
+		$(INSTALL) -d $(prefix)/include/opencascade/UnitsAPI; \
+		cp -fr $(top_srcdir)/src/UnitsAPI $(prefix)/include/opencascade; \
+		cp -f $(top_srcdir)/env_DRAW.sh /etc/profile.d; \
 	fi
 	bd=`pwd`; cd $(top_srcdir); sd=`pwd`; cd $(prefix); pd=`pwd`; cd $$bd; \
 	if [ "$$pd" != "$$sd" ]; then \
 		inst_dirs="$(FoundationClasses_DIRS)"; \
 		if test "x$(FoundationClasses_DIRS)" != "x"; then \
 			for d in $$inst_dirs; do \
-				$(INSTALL) -d $(prefix)/src/$$d; \
-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
+				cp -fr $(top_srcdir)/src/$$d $(prefix)/include/opencascade; \
 			done; \
 		fi; \
 	fi
@@ -134,8 +115,8 @@
 		inst_dirs="$(ModelingData_DIRS)"; \
 		if test "x$(ModelingData_DIRS)" != "x"; then \
 			for d in $$inst_dirs; do \
-				$(INSTALL) -d $(prefix)/src/$$d; \
-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
+				$(INSTALL) -d $(prefix)/include/$$d; \
+				cp -fr $(top_srcdir)/src/$$d $(prefix)/include/opencascade; \
 			done; \
 		fi; \
 	fi
@@ -144,8 +125,8 @@
 		inst_dirs="$(ModelingAlgorithms_DIRS)"; \
 		if test "x$(ModelingAlgorithms_DIRS)" != "x"; then \
 			for d in $$inst_dirs; do \
-				$(INSTALL) -d $(prefix)/src/$$d; \
-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
+				$(INSTALL) -d $(prefix)/include/$$d; \
+				cp -fr $(top_srcdir)/src/$$d $(prefix)/include/opencascade; \
 			done; \
 		fi; \
 	fi
@@ -154,8 +135,8 @@
 		inst_dirs="$(Visualization_DIRS)"; \
 		if test "x$(Visualization_DIRS)" != "x"; then \
 			for d in $$inst_dirs; do \
-				$(INSTALL) -d $(prefix)/src/$$d; \
-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
+				$(INSTALL) -d $(prefix)/include/$$d; \
+				cp -fr $(top_srcdir)/src/$$d $(prefix)/include/opencascade; \
 			done; \
 		fi; \
 	fi
@@ -164,8 +145,8 @@
 		inst_dirs="$(ApplicationFramework_DIRS)"; \
 		if test "x$(ApplicationFramework_DIRS)" != "x"; then \
 			for d in $$inst_dirs; do \
-				$(INSTALL) -d $(prefix)/src/$$d; \
-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
+				$(INSTALL) -d $(prefix)/include/$$d; \
+				cp -fr $(top_srcdir)/src/$$d $(prefix)/include/opencascade; \
 			done; \
 		fi; \
 	fi
@@ -174,8 +155,8 @@
 		inst_dirs="$(DataExchange_DIRS)"; \
 		if test "x$(DataExchange_DIRS)" != "x"; then \
 			for d in $$inst_dirs; do \
-				$(INSTALL) -d $(prefix)/src/$$d; \
-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
+				$(INSTALL) -d $(prefix)/include/$$d; \
+				cp -fr $(top_srcdir)/src/$$d $(prefix)/include/opencascade; \
 			done; \
 		fi; \
 	fi
@@ -184,8 +165,8 @@
 		inst_dirs="$(Draw_DIRS)"; \
 		if test "x$(Draw_DIRS)" != "x"; then \
 			for d in $$inst_dirs; do \
-				$(INSTALL) -d $(prefix)/src/$$d; \
-				cp -fr$(CP_$(platform)) $(top_srcdir)/src/$$d $(prefix)/src; \
+				$(INSTALL) -d $(prefix)/include/$$d; \
+				cp -fr $(top_srcdir)/src/$$d $(prefix)/include/opencascade; \
 			done; \
 		fi; \
 	fi