[Plplot-cvs] SF.net SVN: plplot:[11889] trunk

[<and...@us...>]

Revision: 11889
          http://plplot.svn.sourceforge.net/plplot/?rev=11889&view=rev
Author:   andrewross
Date:     2011-08-22 18:09:33 +0000 (Mon, 22 Aug 2011)

Log Message:
-----------
Change the location for installing ocaml libraries to an unversioned path, e.g. /usr/lib/ocaml/3.11.2 to /usr/lib/ocaml following Debian and other major Linux distrbibutions. 

Modified Paths:
--------------
    trunk/cmake/modules/ocaml.cmake
    trunk/doc/docbook/src/ocaml.xml

Modified: trunk/cmake/modules/ocaml.cmake
===================================================================
--- trunk/cmake/modules/ocaml.cmake	2011-08-18 19:03:54 UTC (rev 11888)
+++ trunk/cmake/modules/ocaml.cmake	2011-08-22 18:09:33 UTC (rev 11889)
@@ -122,7 +122,7 @@
 
   # Installation follows the Debian ocaml policy for want of a better
   # standard.
-  set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ocaml/${OCAML_VERSION}
+  set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ocaml
     CACHE PATH "install location for ocaml files"
     )
 

Modified: trunk/doc/docbook/src/ocaml.xml
===================================================================
--- trunk/doc/docbook/src/ocaml.xml	2011-08-18 19:03:54 UTC (rev 11888)
+++ trunk/doc/docbook/src/ocaml.xml	2011-08-22 18:09:33 UTC (rev 11889)
@@ -209,8 +209,8 @@
         look for PLplot:
       </para>
       <programlisting>
-        export OCAMLPATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml/$OCAML_VERSION:$OCAMLPATH
-        export LD_LIBRARY_PATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml/$OCAML_VERSION/stublibs:$LD_LIBRARY_PATH
+        export OCAMLPATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml:$OCAMLPATH
+        export LD_LIBRARY_PATH=$PLPLOT_INSTALL_PREFIX/lib/ocaml/stublibs:$LD_LIBRARY_PATH
       </programlisting>
     </sect2>
     <sect2 id="ocaml_command_line_sample_project_core">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.