Commit 2e3095f8 authored by duane's avatar duane
Browse files

Missed support for without --exec-prefix and ftd2xx stuff

git-svn-id: svn://svn.berlios.de/openocd/trunk@1283 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 274b3a56
......@@ -36,15 +36,28 @@ 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"
LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib"
fi
# The "INCDIR" is also usable
CFLAGS="$CFLAGS -I$includedir"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment