diff options
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rwxr-xr-x | configure | 13 |
3 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 99d0213..1d645b0 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,7 @@ +2012-03-27: + * (seebs) Merge in: + * (mhatle) Improve configuration compatibility with OE-Core. + 2012-03-26: * (seebs) Add popen() call to set up environment. diff --git a/Makefile.in b/Makefile.in index 3464c7c..5808e4c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,7 +27,7 @@ MARK64=@MARK64@ RPATH=@RPATH@ VERSION=1.2 -LIB=$(shell basename $(LIBDIR)) +LIB=@LIB@ BIN=bin LOCALSTATE=var/pseudo BINDIR=$(PREFIX)/$(BIN) @@ -80,14 +80,18 @@ if [ -z "$opt_prefix" ]; then usage fi -if [ -n "$opt_bits" ] && [ -n "$opt_libdir" ]; then - echo >&2 "Can not specify both --libdir and --bits" - exit 1 -fi if [ -z "$opt_libdir" ]; then opt_libdir=$opt_prefix/lib$opt_mark64 fi +# We need to find the libdir relative to the prefix, this is required +# by the code in pseudo-utils.c that handles relocation. +opt_lib=${opt_libdir#$opt_prefix/} +if [ "$opt_lib" = "$opt_libdir" ]; then + echo >&2 "libdir must be relative to prefix." + exit 1 +fi + if [ ! -f "${opt_sqlite}/include/sqlite3.h" ]; then echo >&2 "SQLite3 headers not found in at ${opt_sqlite}/include/sqlite3.h. Please check that SQLite3 and SQLite3 headers are installed." exit 1 @@ -107,6 +111,7 @@ fi sed -e ' s,@PREFIX@,'"$opt_prefix"',g s,@LIBDIR@,'"$opt_libdir"',g + s,@LIB@,'"$opt_lib"',g s,@SUFFIX@,'"$opt_suffix"',g s,@SQLITE@,'"$opt_sqlite"',g s!@RPATH@!'"$opt_rpath"'!g |