X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=f00119891249d3fd7889336b100a97708805ffc3;hb=8fc9bcb7f57306e822deaf2e0facd51b96dc4fb2;hp=8f3bbdf129ed8bc1480badc3617be26a8521a006;hpb=21eff7095c50bcdc74000e6cda0c76aa3d16b854;p=openocd.git

diff --git a/configure.in b/configure.in
index 8f3bbdf129..f001198912 100644
--- a/configure.in
+++ b/configure.in
@@ -36,15 +36,26 @@ is_win32=no
 # 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"
+    if test $host_os = linux-gnu || test $host_os = linux ; then
+	LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib"
     fi
     # The "INCDIR" is also usable
     CFLAGS="$CFLAGS -I$includedir"
@@ -110,7 +121,6 @@ AC_ARG_WITH(ftd2xx-win32-zipdir,
   true
   ]
 )
-	
 
 AC_ARG_WITH(ftd2xx-linux-tardir,
   AS_HELP_STRING([--with-ftd2xx-linux-tardir], [Where (Linux/Unix) the tar file from ftdichip.com was unpacked <default=search>]),
@@ -133,7 +143,6 @@ AC_ARG_WITH(ftd2xx-linux-tardir,
   ]
 )
 
-
 AC_ARG_WITH(ftd2xx-lib,
 	AS_HELP_STRING([--with-ftd2xx-lib], [Use static or shared ftd2xx libs on default static]),
 [
@@ -251,7 +260,6 @@ AC_ARG_ENABLE(rlink,
   AS_HELP_STRING([--enable-rlink], [Enable building support for the Raisonance RLink JTAG Programmer]),
   [build_rlink=$enableval], [build_rlink=no])
 
-
 case $host in 
   *-cygwin*) 
     is_win32=yes
@@ -302,7 +310,6 @@ else
   AC_DEFINE(BUILD_DUMMY, 0, [0 if you don't want dummy driver.])
 fi
 
-
 if test $build_ep93xx = yes; then
   build_bitbang=yes
   AC_DEFINE(BUILD_EP93XX, 1, [1 if you want ep93xx.])
@@ -452,12 +459,12 @@ AC_MSG_CHECKING([for ftd2xx.lib exists (win32)])
       # And calculate the LDFLAGS for the machine
       case "$host_cpu" in
       i?86|x86_*)
-	LDFLAGS="$LFLAGS -L$with_ftd2xx_win32_zipdir/i386"
+	LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/i386"
 	LIBS="$LIBS -lftd2xx"
 	f=$with_ftd2xx_win32_zipdir/i386/ftd2xx.lib
 	;;
       amd64)
-	LDFLAGS="$LFLAGS -L$with_ftd2xx_win32_zipdir/amd64"
+	LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/amd64"
 	LIBS="$LIBS -lftd2xx"
 	f=$with_ftd2xx_win32_zipdir/amd64/ftd2xx.lib
 	;;
@@ -475,7 +482,6 @@ AC_MSG_CHECKING([for ftd2xx.lib exists (win32)])
 fi
 fi
 
-
 if test $is_win32 = no; then
 
 if test "${with_ftd2xx_win32_zipdir+set}" = set
@@ -487,7 +493,7 @@ if test $build_ft2232_ftd2xx = yes ; then
    AC_MSG_CHECKING([for libftd2xx.a (linux)])
    # Must be linux -
    # Cause FTDICHIP does not supply a MAC-OS version
-   if test $host_os != linux-gnu; then
+   if test $host_os != linux-gnu && test $host_os != linux ; then
       AC_MSG_ERROR([The (linux) ftd2xx library from FTDICHIP.com is linux only. Try --enable-ft2232-libftdi instead])
    fi
    # Are we given a TAR directory?
@@ -617,8 +623,6 @@ main( int argc, char **argv )
 LDFLAGS=$LDFLAGS_SAVE
 CFLAGS=$CFLAGS_SAVE
 fi
-   
-
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(openocd, 1.0)
@@ -701,6 +705,4 @@ fi
 AC_MSG_RESULT([$EXEEXT_FOR_BUILD])
 AC_SUBST(EXEEXT_FOR_BUILD)
 
-#AC_SUBST(WITH_FTD2XX, $with_ftd2xx)
-
 AC_OUTPUT(Makefile src/Makefile src/helper/Makefile src/jtag/Makefile src/xsvf/Makefile src/target/Makefile src/server/Makefile src/flash/Makefile src/pld/Makefile doc/Makefile)