FLTK logo

[Library] r8474 - branches/branch-1.3

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[Library] r8474 - branches/branch-1.3 fltk-dev Feb 25, 2011  
 
Author: manolo
Date: 2011-02-25 14:19:09 -0800 (Fri, 25 Feb 2011)
New Revision: 8474
Log:
Fix STR #2516: under MSys, the FLTK_DOCDIR config.h variable did not allow
fluid to find its help files even if they are correctly installed.

Modified:
   branches/branch-1.3/configure.in

Modified: branches/branch-1.3/configure.in
===================================================================
--- branches/branch-1.3/configure.in	2011-02-25 09:15:57 UTC (rev 8473)
+++ branches/branch-1.3/configure.in	2011-02-25 22:19:09 UTC (rev 8474)
@@ -1292,11 +1292,21 @@
 fi
 
 dnl Define the FLTK documentation directory...
-if test x$prefix = xNONE; then
-    AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk")
-else
-    AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk")
-fi
+case $uname in
+  MINGW*)
+     # Determine the path where MSys has /usr installed
+ 	msyspath=`mount | grep '\/usr' | grep -v '\/usr\/bin' | cut -d ' ' -f -1 | sed -e 's/\\\/\// g'`
+     # Then substitute that in the WIN32 path instead of /usr
+ 	AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$msyspath/local/share/doc/fltk")
+    ;;
+  *)
+    if test x$prefix = xNONE; then
+	AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk")
+    else
+	AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk")
+    fi
+    ;;
+esac
 
 dnl Define the FLTK data directory...
 if test x$prefix = xNONE; then
@@ -1339,6 +1349,11 @@
 echo "                 includedir=$includedir"
 echo "                 libdir=$libdir"
 echo "                 mandir=$mandir"
+case $uname in
+  MINGW*)
+    echo "                 MSys docpath=$msyspath/local/share/doc/fltk"
+  ;;
+esac
 echo "       Graphics: $graphics"
 
 if test x$JPEG = x; then

Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.