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

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

Revision: 10136
          http://plplot.svn.sourceforge.net/plplot/?rev=10136&view=rev
Author:   andrewross
Date:     2009-07-10 18:56:45 +0000 (Fri, 10 Jul 2009)

Log Message:
-----------
plLibOpenPdfstrm should look in the data directory in the source tree not the build tree when run from the build tree. Data files (fonts, maps, colour maps) are source files and not generated.

Modified Paths:
--------------
    trunk/config.h.cmake
    trunk/src/plctrl.c

Modified: trunk/config.h.cmake
===================================================================
--- trunk/config.h.cmake	2009-07-10 06:21:20 UTC (rev 10135)
+++ trunk/config.h.cmake	2009-07-10 18:56:45 UTC (rev 10136)
@@ -462,6 +462,9 @@
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE ${RETSIGTYPE}
 
+/* Location of Source tree */
+#define SOURCE_DIR "${SOURCE_DIR}"
+
 /* Define to 1 if you have the ANSI C header files. */
 #cmakedefine STDC_HEADERS 1
 

Modified: trunk/src/plctrl.c
===================================================================
--- trunk/src/plctrl.c	2009-07-10 06:21:20 UTC (rev 10135)
+++ trunk/src/plctrl.c	2009-07-10 18:56:45 UTC (rev 10136)
@@ -1736,7 +1736,7 @@
 /****   search build tree               ****/
 
     if (plInBuildTree() == 1) {
-      plGetName(BUILD_DIR, "data", fn, &fs);
+      plGetName(SOURCE_DIR, "data", fn, &fs);
 
       if ((file = pdf_fopen(fs, "rb")) != NULL)
         goto done;


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