From c4bd4bfb19debed974962d09266606b7ca11bab4 Mon Sep 17 00:00:00 2001 From: Daniel Wallin Date: Sun, 21 Sep 2008 14:46:48 +0200 Subject: [PATCH] Added support for building on FreeBSD. Search for library files in more places. On FreeBSD the lua library lives in a "lua51" subdirectory to /usr/local/lib. --- Jamroot | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Jamroot b/Jamroot index 65abb83..3c834d5 100755 --- a/Jamroot +++ b/Jamroot @@ -49,7 +49,7 @@ if [ os.name ] = NT lib lua : : lua5.1 $(LUA_PATH) : : $(includes) ; } } -else if [ os.name ] in LINUX MACOSX +else if [ os.name ] in LINUX MACOSX FREEBSD { LUA_PATH = [ os.environ LUA_PATH ] ; HOME = [ os.environ HOME ] ; @@ -76,13 +76,13 @@ else if [ os.name ] in LINUX MACOSX } local lib = $(prefix)/lib ; + library = [ GLOB $(lib)/lua51 $(lib)/lua5.1 $(lib)/lua $(lib) : + liblua5.1.* liblua51.* liblua.* ] ; + lib-name = [ MATCH "lib(.*)" : $(library[1]:B) ] ; debug-message prefix: $(prefix) ; debug-message includes: $(includes) ; - debug-message lib: $(lib) ; - - library = [ GLOB $(lib) : liblua5.1.* liblua51.* liblua.* ] ; - lib-name = [ MATCH "lib(.*)" : $(library[1]:B) ] ; + debug-message lib: $(library:D) ; if ! $(lib-name) { @@ -90,8 +90,15 @@ else if [ os.name ] in LINUX MACOSX } lib m : : shared ; - lib dl : : shared ; - lib lua : m dl : $(lib-name) $(lib) : : $(includes) ; + if [ os.name ] = LINUX + { + lib dl : : shared ; + } + else + { + alias dl ; + } + lib lua : m dl : $(lib-name) $(library:D) : : $(includes) ; } SOURCES = -- 2.11.4.GIT