diff -Naur inventor/apps/examples/Mentor/CXX/04.1.Cameras.c++ inventor-11/apps/examples/Mentor/CXX/04.1.Cameras.c++
--- inventor/apps/examples/Mentor/CXX/04.1.Cameras.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/04.1.Cameras.c++	Mon Apr 12 17:26:47 2004
@@ -89,7 +89,7 @@
 
    // Read the object from a file and add to the scene
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/parkbench.iv")) 
+   if (!myInput.openFile("../../data/parkbench.iv")) 
       exit (1);
    SoSeparator *fileContents = SoDB::readAll(&myInput);
    if (fileContents == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/05.6.TransformOrdering.c++ inventor-11/apps/examples/Mentor/CXX/05.6.TransformOrdering.c++
--- inventor/apps/examples/Mentor/CXX/05.6.TransformOrdering.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/05.6.TransformOrdering.c++	Mon Apr 12 17:26:47 2004
@@ -95,7 +95,7 @@
 
    // Read an object from file. (as in example 4.2.Lights)
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/temple.iv")) 
+   if (!myInput.openFile("../../data/temple.iv")) 
       exit (1);
    SoSeparator *fileContents = SoDB::readAll(&myInput);
    if (fileContents == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/06.1.Text.c++ inventor-11/apps/examples/Mentor/CXX/06.1.Text.c++
--- inventor/apps/examples/Mentor/CXX/06.1.Text.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/06.1.Text.c++	Mon Apr 12 17:26:47 2004
@@ -82,7 +82,7 @@
    sphereSep->addChild(myTexture2);
    sphereSep->addChild(sphereComplexity);
    sphereSep->addChild(new SoSphere);
-   myTexture2->filename = "/usr/share/src/Inventor/examples/data/globe.rgb";
+   myTexture2->filename = "../../data/globe.rgb";
 
    // Add Text2 for AFRICA, translated to proper location.
    SoSeparator *africaSep = new SoSeparator;
diff -Naur inventor/apps/examples/Mentor/CXX/06.2.Simple3DText.c++ inventor-11/apps/examples/Mentor/CXX/06.2.Simple3DText.c++
--- inventor/apps/examples/Mentor/CXX/06.2.Simple3DText.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/06.2.Simple3DText.c++	Mon Apr 12 17:26:47 2004
@@ -92,7 +92,7 @@
    sphereSep->addChild(myTexture2);
    sphereSep->addChild(sphereComplexity);
    sphereSep->addChild(new SoSphere);
-   myTexture2->filename = "/usr/share/src/Inventor/examples/data/globe.rgb";
+   myTexture2->filename = "../../data/globe.rgb";
 
    // Add Text3 for AFRICA, transformed to proper location.
    SoSeparator *africaSep = new SoSeparator;
diff -Naur inventor/apps/examples/Mentor/CXX/07.1.BasicTexture.c++ inventor-11/apps/examples/Mentor/CXX/07.1.BasicTexture.c++
--- inventor/apps/examples/Mentor/CXX/07.1.BasicTexture.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/07.1.BasicTexture.c++	Mon Apr 12 17:26:47 2004
@@ -61,7 +61,7 @@
    // Choose a texture 
    SoTexture2 *rock = new SoTexture2;
    root->addChild(rock);
-   rock->filename.setValue("/usr/share/src/Inventor/examples/data/brick.1.rgb");
+   rock->filename.setValue("../../data/brick.1.rgb");
 
    // Make a cube
    root->addChild(new SoCube);
diff -Naur inventor/apps/examples/Mentor/CXX/07.2.TextureCoordinates.c++ inventor-11/apps/examples/Mentor/CXX/07.2.TextureCoordinates.c++
--- inventor/apps/examples/Mentor/CXX/07.2.TextureCoordinates.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/07.2.TextureCoordinates.c++	Mon Apr 12 17:26:47 2004
@@ -66,7 +66,7 @@
    // Choose a texture 
    SoTexture2 *brick = new SoTexture2;
    root->addChild(brick);
-   brick->filename.setValue("/usr/share/src/Inventor/examples/data/brick.1.rgb");
+   brick->filename.setValue("../../data/brick.1.rgb");
 
 #ifdef IV_STRICT
    // This is the preferred code for Inventor 2.1 
diff -Naur inventor/apps/examples/Mentor/CXX/07.3.TextureFunction.c++ inventor-11/apps/examples/Mentor/CXX/07.3.TextureFunction.c++
--- inventor/apps/examples/Mentor/CXX/07.3.TextureFunction.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/07.3.TextureFunction.c++	Mon Apr 12 17:26:47 2004
@@ -69,7 +69,7 @@
    // Choose a texture.
    SoTexture2 *faceTexture = new SoTexture2;
    root->addChild(faceTexture);
-   faceTexture->filename.setValue("/usr/share/src/Inventor/examples/data/sillyFace.rgb");
+   faceTexture->filename.setValue("../../data/sillyFace.rgb");
 
    // Make the diffuse color pure white
    SoMaterial *myMaterial = new SoMaterial;
diff -Naur inventor/apps/examples/Mentor/CXX/08.1.BSCurve.c++ inventor-11/apps/examples/Mentor/CXX/08.1.BSCurve.c++
--- inventor/apps/examples/Mentor/CXX/08.1.BSCurve.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/08.1.BSCurve.c++	Mon Apr 12 17:26:47 2004
@@ -79,7 +79,7 @@
    "      scaleFactor 8 8\n"
    "   }\n"
    "   Texture2 {\n"
-   "      filename /usr/share/src/Inventor/examples/data/oak.rgb\n"
+   "      filename ../../data/oak.rgb\n"
    "   }\n"
    "   NormalBinding {\n"
    "        value  PER_PART\n"
diff -Naur inventor/apps/examples/Mentor/CXX/08.2.UniCurve.c++ inventor-11/apps/examples/Mentor/CXX/08.2.UniCurve.c++
--- inventor/apps/examples/Mentor/CXX/08.2.UniCurve.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/08.2.UniCurve.c++	Mon Apr 12 17:26:47 2004
@@ -80,7 +80,7 @@
    "      scaleFactor 8 8\n"
    "   }\n"
    "   Texture2 {\n"
-   "      filename /usr/share/src/Inventor/examples/data/oak.rgb\n"
+   "      filename ../../data/oak.rgb\n"
    "   }\n"
    "   NormalBinding {\n"
    "        value  PER_PART\n"
diff -Naur inventor/apps/examples/Mentor/CXX/08.3.BezSurf.c++ inventor-11/apps/examples/Mentor/CXX/08.3.BezSurf.c++
--- inventor/apps/examples/Mentor/CXX/08.3.BezSurf.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/08.3.BezSurf.c++	Mon Apr 12 17:26:47 2004
@@ -81,7 +81,7 @@
    "      scaleFactor 8 8\n"
    "   }\n"
    "   Texture2 {\n"
-   "      filename /usr/share/src/Inventor/examples/data/oak.rgb\n"
+   "      filename ../../data/oak.rgb\n"
    "   }\n"
    "   NormalBinding {\n"
    "        value  PER_PART\n"
@@ -212,7 +212,7 @@
    SoTexture2   *tex    = new SoTexture2;
 
    tex->ref();
-   tex->filename.setValue("/usr/share/src/Inventor/examples/data/diamondRug.rgb");
+   tex->filename.setValue("../../data/diamondRug.rgb");
    carpet->addChild(tex);
    carpet->addChild(surf);
    root->addChild(carpet);
diff -Naur inventor/apps/examples/Mentor/CXX/08.4.TrimSurf.c++ inventor-11/apps/examples/Mentor/CXX/08.4.TrimSurf.c++
--- inventor/apps/examples/Mentor/CXX/08.4.TrimSurf.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/08.4.TrimSurf.c++	Mon Apr 12 17:26:48 2004
@@ -90,7 +90,7 @@
    "      scaleFactor 8 8\n"
    "   }\n"
    "   Texture2 {\n"
-   "      filename /usr/share/src/Inventor/examples/data/oak.rgb\n"
+   "      filename ../../data/oak.rgb\n"
    "   }\n"
    "   NormalBinding {\n"
    "        value  PER_PART\n"
@@ -275,7 +275,7 @@
    SoTexture2   *tex    = new SoTexture2;
 
    tex->ref();
-   tex->filename.setValue("/usr/share/src/Inventor/examples/data/diamondRug.rgb");
+   tex->filename.setValue("../../data/diamondRug.rgb");
    carpet->addChild(tex);
    carpet->addChild(surf);
    root->addChild(carpet);
diff -Naur inventor/apps/examples/Mentor/CXX/09.2.Texture.c++ inventor-11/apps/examples/Mentor/CXX/09.2.Texture.c++
--- inventor/apps/examples/Mentor/CXX/09.2.Texture.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/09.2.Texture.c++	Mon Apr 12 17:26:48 2004
@@ -95,7 +95,7 @@
    SoNode *result;
 
    texRoot->ref();
-   in.openFile("/usr/share/src/Inventor/examples/data/jumpyMan.iv");
+   in.openFile("../../data/jumpyMan.iv");
    SoDB::read(&in, result);
 
    SoPerspectiveCamera *myCamera = new SoPerspectiveCamera;
diff -Naur inventor/apps/examples/Mentor/CXX/09.3.Search.c++ inventor-11/apps/examples/Mentor/CXX/09.3.Search.c++
--- inventor/apps/examples/Mentor/CXX/09.3.Search.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/09.3.Search.c++	Mon Apr 12 17:26:48 2004
@@ -58,7 +58,7 @@
 
    // Open and read input scene graph
    SoInput sceneInput;
-   if (! sceneInput.openFile("/usr/share/src/Inventor/examples/data/bird.iv"))
+   if (! sceneInput.openFile("../../data/bird.iv"))
       return (1);
 
    SoSeparator *root = SoDB::readAll(&sceneInput);
diff -Naur inventor/apps/examples/Mentor/CXX/09.4.PickAction.c++ inventor-11/apps/examples/Mentor/CXX/09.4.PickAction.c++
--- inventor/apps/examples/Mentor/CXX/09.4.PickAction.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/09.4.PickAction.c++	Mon Apr 12 17:26:48 2004
@@ -128,7 +128,7 @@
 
    // Read object data from a file
    SoInput mySceneInput;
-   if (!mySceneInput.openFile("/usr/share/src/Inventor/examples/data/star.iv")) 
+   if (!mySceneInput.openFile("../../data/star.iv")) 
       exit (1);
    SoSeparator *starObject = SoDB::readAll(&mySceneInput);
    if (starObject == NULL) exit (1);
diff -Naur inventor/apps/examples/Mentor/CXX/10.6.PickFilterTopLevel.c++ inventor-11/apps/examples/Mentor/CXX/10.6.PickFilterTopLevel.c++
--- inventor/apps/examples/Mentor/CXX/10.6.PickFilterTopLevel.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/10.6.PickFilterTopLevel.c++	Mon Apr 12 17:26:48 2004
@@ -86,7 +86,7 @@
     
    // Open the data file
    SoInput in;   
-   char *datafile = "/usr/share/src/Inventor/examples/data/parkbench.iv";
+   char *datafile = "../../data/parkbench.iv";
    if (! in.openFile(datafile)) {
       fprintf(stderr, "Cannot open %s for reading.\n", datafile);
       exit(1);
diff -Naur inventor/apps/examples/Mentor/CXX/11.1.ReadFile.c++ inventor-11/apps/examples/Mentor/CXX/11.1.ReadFile.c++
--- inventor/apps/examples/Mentor/CXX/11.1.ReadFile.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/11.1.ReadFile.c++	Mon Apr 12 17:26:48 2004
@@ -84,7 +84,7 @@
    Widget myWindow = SoXt::init(argv[0]);
 
    // Read the file
-   SoSeparator *scene = readFile("/usr/share/src/Inventor/examples/data/bookshelf.iv");
+   SoSeparator *scene = readFile("../../data/bookshelf.iv");
 
    // Create a viewer
    SoXtExaminerViewer *myViewer = 
diff -Naur inventor/apps/examples/Mentor/CXX/13.2.ElapsedTime.c++ inventor-11/apps/examples/Mentor/CXX/13.2.ElapsedTime.c++
--- inventor/apps/examples/Mentor/CXX/13.2.ElapsedTime.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/13.2.ElapsedTime.c++	Mon Apr 12 17:26:48 2004
@@ -88,7 +88,7 @@
 
    // Read the figure object from a file and add to the scene
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/jumpyMan.iv")) 
+   if (!myInput.openFile("../../data/jumpyMan.iv")) 
       exit (1);
    SoSeparator *figureObject = SoDB::readAll(&myInput);
    if (figureObject == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/13.3.TimeCounter.c++ inventor-11/apps/examples/Mentor/CXX/13.3.TimeCounter.c++
--- inventor/apps/examples/Mentor/CXX/13.3.TimeCounter.c++	Fri Jul 18 00:12:37 2003
+++ inventor-11/apps/examples/Mentor/CXX/13.3.TimeCounter.c++	Mon Apr 12 17:26:48 2004
@@ -93,7 +93,7 @@
 
    // Read the man object from a file and add to the scene
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/jumpyMan.iv")) 
+   if (!myInput.openFile("../../data/jumpyMan.iv")) 
       exit (1);
    SoSeparator *manObject = SoDB::readAll(&myInput);
    if (manObject == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/13.4.Gate.c++ inventor-11/apps/examples/Mentor/CXX/13.4.Gate.c++
--- inventor/apps/examples/Mentor/CXX/13.4.Gate.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/13.4.Gate.c++	Mon Apr 12 17:26:48 2004
@@ -115,7 +115,7 @@
 
    // Read the duck object from a file and add to the group
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/duck.iv")) 
+   if (!myInput.openFile("../../data/duck.iv")) 
       exit (1);
    SoSeparator *duckObject = SoDB::readAll(&myInput);
    if (duckObject == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/13.5.Boolean.c++ inventor-11/apps/examples/Mentor/CXX/13.5.Boolean.c++
--- inventor/apps/examples/Mentor/CXX/13.5.Boolean.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/13.5.Boolean.c++	Mon Apr 12 17:26:48 2004
@@ -118,7 +118,7 @@
 
    // Read the duck object from a file and add to the group
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/duck.iv")) 
+   if (!myInput.openFile("../../data/duck.iv")) 
       exit (1);
    SoSeparator *duckObject = SoDB::readAll(&myInput);
    if (duckObject == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/13.6.Calculator.c++ inventor-11/apps/examples/Mentor/CXX/13.6.Calculator.c++
--- inventor/apps/examples/Mentor/CXX/13.6.Calculator.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/13.6.Calculator.c++	Mon Apr 12 17:26:48 2004
@@ -85,7 +85,7 @@
 
    // Read the background path from a file and add to the group
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/flowerPath.iv")) 
+   if (!myInput.openFile("../../data/flowerPath.iv")) 
       exit (1);
    SoSeparator *flowerPath = SoDB::readAll(&myInput);
    if (flowerPath == NULL) exit (1);
@@ -99,7 +99,7 @@
    root->addChild(flowerGroup);
 
    // Read the flower object from a file and add to the group
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/flower.iv")) 
+   if (!myInput.openFile("../../data/flower.iv")) 
       exit (1);
    SoSeparator *flower= SoDB::readAll(&myInput);
    if (flower == NULL) exit (1);
diff -Naur inventor/apps/examples/Mentor/CXX/13.7.Rotor.c++ inventor-11/apps/examples/Mentor/CXX/13.7.Rotor.c++
--- inventor/apps/examples/Mentor/CXX/13.7.Rotor.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/13.7.Rotor.c++	Mon Apr 12 17:26:48 2004
@@ -82,7 +82,7 @@
 
    // Read in the data for the windmill tower
    SoSeparator *windmillTower = 
-            readFile("/usr/share/src/Inventor/examples/data/windmillTower.iv");
+            readFile("../../data/windmillTower.iv");
    root->addChild(windmillTower);
 
    // Add a rotor node to spin the vanes
@@ -93,7 +93,7 @@
 
    // Read in the data for the windmill vanes
    SoSeparator *windmillVanes = 
-            readFile("/usr/share/src/Inventor/examples/data/windmillVanes.iv");
+            readFile("../../data/windmillVanes.iv");
    root->addChild(windmillVanes);
 
    // Create a viewer
diff -Naur inventor/apps/examples/Mentor/CXX/13.8.Blinker.c++ inventor-11/apps/examples/Mentor/CXX/13.8.Blinker.c++
--- inventor/apps/examples/Mentor/CXX/13.8.Blinker.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/13.8.Blinker.c++	Mon Apr 12 17:26:48 2004
@@ -70,7 +70,7 @@
 
    // Read in the parts of the sign from a file
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/eatAtJosies.iv")) 
+   if (!myInput.openFile("../../data/eatAtJosies.iv")) 
       exit (1);
    SoSeparator *fileContents = SoDB::readAll(&myInput);
    if (fileContents == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/14.2.Editors.c++ inventor-11/apps/examples/Mentor/CXX/14.2.Editors.c++
--- inventor/apps/examples/Mentor/CXX/14.2.Editors.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/14.2.Editors.c++	Mon Apr 12 17:26:48 2004
@@ -88,7 +88,7 @@
 
    // Read an object from file. 
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/desk.iv")) 
+   if (!myInput.openFile("../../data/desk.iv")) 
       exit (1);
    SoSeparator *fileContents = SoDB::readAll(&myInput);
    if (fileContents == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/15.3.AttachManip.c++ inventor-11/apps/examples/Mentor/CXX/15.3.AttachManip.c++
--- inventor/apps/examples/Mentor/CXX/15.3.AttachManip.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/15.3.AttachManip.c++	Mon Apr 12 17:26:48 2004
@@ -119,7 +119,7 @@
    SoWrapperKit *myWrapperKit = new SoWrapperKit;
    root->addChild(myWrapperKit);
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/luxo.iv")) 
+   if (!myInput.openFile("../../data/luxo.iv")) 
       exit (1);
    SoSeparator *objectFromFile = SoDB::readAll(&myInput);
    if (objectFromFile == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/16.2.Callback.c++ inventor-11/apps/examples/Mentor/CXX/16.2.Callback.c++
--- inventor/apps/examples/Mentor/CXX/16.2.Callback.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/16.2.Callback.c++	Mon Apr 12 17:26:48 2004
@@ -91,7 +91,7 @@
 
    // Read the geometry from a file and add to the scene
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/dogDish.iv")) 
+   if (!myInput.openFile("../../data/dogDish.iv")) 
       exit (1);
    SoSeparator *geomObject = SoDB::readAll(&myInput);
    if (geomObject == NULL) 
diff -Naur inventor/apps/examples/Mentor/CXX/16.3.AttachEditor.c++ inventor-11/apps/examples/Mentor/CXX/16.3.AttachEditor.c++
--- inventor/apps/examples/Mentor/CXX/16.3.AttachEditor.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/16.3.AttachEditor.c++	Mon Apr 12 17:26:48 2004
@@ -80,7 +80,7 @@
 
    // Read the geometry from a file and add to the scene
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/dogDish.iv"))
+   if (!myInput.openFile("../../data/dogDish.iv"))
       exit (1);
    SoSeparator *geomObject = SoDB::readAll(&myInput);
    if (geomObject == NULL)
diff -Naur inventor/apps/examples/Mentor/CXX/16.4.OneWindow.c++ inventor-11/apps/examples/Mentor/CXX/16.4.OneWindow.c++
--- inventor/apps/examples/Mentor/CXX/16.4.OneWindow.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/16.4.OneWindow.c++	Mon Apr 12 17:26:48 2004
@@ -98,7 +98,7 @@
 
    // Read the geometry from a file and add to the scene
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/dogDish.iv"))
+   if (!myInput.openFile("../../data/dogDish.iv"))
       exit (1);
    SoSeparator *geomObject = SoDB::readAll(&myInput);
    if (geomObject == NULL)
diff -Naur inventor/apps/examples/Mentor/CXX/16.5.Examiner.c++ inventor-11/apps/examples/Mentor/CXX/16.5.Examiner.c++
--- inventor/apps/examples/Mentor/CXX/16.5.Examiner.c++	Fri Jul 18 00:12:38 2003
+++ inventor-11/apps/examples/Mentor/CXX/16.5.Examiner.c++	Mon Apr 12 17:26:48 2004
@@ -61,7 +61,7 @@
    
    // Read the geometry from a file and add to the scene
    SoInput myInput;
-   if (!myInput.openFile("/usr/share/src/Inventor/examples/data/dogDish.iv"))
+   if (!myInput.openFile("../../data/dogDish.iv"))
       exit (1);
    SoSeparator *geomObject = SoDB::readAll(&myInput);
    if (geomObject == NULL)
diff -Naur inventor/apps/examples/Toolmaker/09.Highlights/overlayTest.c++ inventor-11/apps/examples/Toolmaker/09.Highlights/overlayTest.c++
--- inventor/apps/examples/Toolmaker/09.Highlights/overlayTest.c++	Fri Jul 18 23:07:41 2003
+++ inventor-11/apps/examples/Toolmaker/09.Highlights/overlayTest.c++	Mon Apr 12 17:26:48 2004
@@ -63,7 +63,7 @@
     
    // Open the data file
    SoInput in;   
-   char *datafile = "/usr/share/src/Inventor/examples/data/monitor.iv";
+   char *datafile = "../../data/monitor.iv";
    if (! in.openFile(datafile)) {
       fprintf(stderr, "Cannot open %s for reading.\n", datafile);
       exit(1);
diff -Naur inventor/apps/examples/Toolmaker/09.Highlights/selectionTest.c++ inventor-11/apps/examples/Toolmaker/09.Highlights/selectionTest.c++
--- inventor/apps/examples/Toolmaker/09.Highlights/selectionTest.c++	Fri Jul 18 23:07:41 2003
+++ inventor-11/apps/examples/Toolmaker/09.Highlights/selectionTest.c++	Mon Apr 12 17:26:48 2004
@@ -63,7 +63,7 @@
     
    // Open the data file
    SoInput in;   
-   char *datafile = "/usr/share/src/Inventor/examples/data/monitor.iv";
+   char *datafile = "../../data/monitor.iv";
    if (! in.openFile(datafile)) {
       fprintf(stderr, "Cannot open %s for reading.\n", datafile);
       exit(1);
diff -Naur inventor/make/ivcommondefs inventor-11/make/ivcommondefs
--- inventor/make/ivcommondefs	Sat Jul 12 00:40:54 2003
+++ inventor-11/make/ivcommondefs	Mon Apr 12 17:29:41 2004
@@ -9,7 +9,8 @@
 # Settings for systems without single-precision math functions.
 #
 
-MATHDEFS = -D_DOUBLE_MATH_ONLY
+#MATHDEFS = -D_DOUBLE_MATH_ONLY
+MATHDEFS =
 
 
 
@@ -111,8 +112,8 @@
 LCOPTS += $(DARWINOPTS)
 
 X11DIR = /usr/X11R6
-X11INCDIR = $(X11DIR)/include
-X11LIBDIR = $(X11DIR)/lib
+X11INCDIR = $(X11DIR)/include -I/sw/include -I/sw/lib/freetype2/include
+X11LIBDIR = $(X11DIR)/lib -L/sw/lib -L/sw/lib/freetype2/lib -lm -L$(IVDEPTH)/lib -L$(IVDEPTH)/libSoXt
 
 LCXXINCS += -I$(X11INCDIR)
 LCINCS += -I$(X11INCDIR) -I$(X11INCDIR)/freetype2
@@ -161,8 +162,12 @@
 FLDIR = $(IVDEPTH)/libFL/src
 FLLIB = -lFL
 ifdef FREETYPE
-FLDIR = $(IVDEPTH)/libFL/freetype
+FLDIR = $(IVDEPTH)/libFL/freetype 
 FLLIB += -lfreetype
+ifeq ($(usingDarwin), 1)
+FLDIR = $(IVDEPTH)/libFL/freetype 
+FLLIB = $(IVDEPTH)/libFL/freetype/libFL.a -lfreetype
+endif
 endif
 
 
diff -Naur inventor/make/localrules.apple inventor-11/make/localrules.apple
--- inventor/make/localrules.apple	Sat Jul 12 00:40:54 2003
+++ inventor-11/make/localrules.apple	Mon Apr 12 17:26:48 2004
@@ -4,7 +4,7 @@
 ifeq ($(usingDarwin), 1)
 
 LIBDSO := $(LIBDSO:.so=.dylib)
-LLDLIBS += -lXm -lXt -lX11 -lGLU -lGL -liconv -ldl -lcc_dynamic -lstdc++
+LLDLIBS += -lXi -lXm -lXt -lX11 -lGLU -lGL -liconv -ldl -lcc_dynamic -lstdc++ -lmx
 
 BUNDLE := $(DSO:.so=.bundle)
 DSO :=