[Openocd-svn] r1283 - trunk

[<du...@ma...>]

Author: duane
Date: 2008-12-27 14:47:36 +0100 (Sat, 27 Dec 2008)
New Revision: 1283

Modified:
   trunk/configure.in
Log:
Missed support for without --exec-prefix and ftd2xx stuff

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-12-27 03:13:50 UTC (rev 1282)
+++ trunk/configure.in	2008-12-27 13:47:36 UTC (rev 1283)
@@ -36,15 +36,28 @@
 # And - if we are being installed there - the odds are
 # The libraries unique to what we are are there too.
 #
+
+# Expand nd deal with NONE - just like configure will do later
+OCDprefix=$prefix
+OCDxprefix=$exec_prefix
+test x"$OCDprefix"  = xNONE && OCDprefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test x"$OCDxprefix" = xNONE && OCDxprefix="$OCDprefix"
+
+
 # what matters is the "exec-prefix"
-if test $exec_prefix != $ac_default_prefix
+if test "$OCDxprefix" != "$ac_default_prefix"
 then
+    # We are installing in a non-standard place
+    # Nonstandard --prefix and/or --exec-prefix
+    # We have an override of some sort.
     # use build specific install library dir
-    LDFLAGS="$LDFLAGS -L$libdir"
+    
+    LDFLAGS="$LDFLAGS -L$OCDxprefix/lib"
     # RPATH becomes an issue on Linux only
     if test $host_os = linux-gnu
     then
-	LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
+	LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib"
     fi
     # The "INCDIR" is also usable
     CFLAGS="$CFLAGS -I$includedir"