From 7a10a8eb0da3c7cc8790065137fa1c26bee97576 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 18 Jun 2012 17:00:49 -0700 Subject: [PATCH] macosx: Remove /opt/local prefix on some mac ffi libs. --- basis/cairo/ffi/ffi.factor | 2 +- basis/glib/ffi/ffi.factor | 2 +- extra/tokyo/alien/tcrdb/tcrdb.factor | 2 +- extra/tokyo/alien/tcutil/tcutil.factor | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/basis/cairo/ffi/ffi.factor b/basis/cairo/ffi/ffi.factor index df6d2cdbd6..6f0001d5d8 100644 --- a/basis/cairo/ffi/ffi.factor +++ b/basis/cairo/ffi/ffi.factor @@ -10,7 +10,7 @@ IN: cairo.ffi << { { [ os windows? ] [ "cairo" "libcairo-2.dll" cdecl add-library ] } - { [ os macosx? ] [ "cairo" "/opt/local/lib/libcairo.dylib" cdecl add-library ] } + { [ os macosx? ] [ "cairo" "libcairo.dylib" cdecl add-library ] } { [ os unix? ] [ ] } } cond >> diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor index 96d92663eb..c7bca2e8be 100644 --- a/basis/glib/ffi/ffi.factor +++ b/basis/glib/ffi/ffi.factor @@ -11,7 +11,7 @@ LIBRARY: glib << "glib" { { [ os windows? ] [ "libglib-2.0-0.dll" cdecl add-library ] } - { [ os macosx? ] [ "/opt/local/lib/libglib-2.0.0.dylib" cdecl add-library ] } + { [ os macosx? ] [ "libglib-2.0.0.dylib" cdecl add-library ] } { [ os unix? ] [ drop ] } } cond >> diff --git a/extra/tokyo/alien/tcrdb/tcrdb.factor b/extra/tokyo/alien/tcrdb/tcrdb.factor index 7f98f431c7..44a3b13918 100644 --- a/extra/tokyo/alien/tcrdb/tcrdb.factor +++ b/extra/tokyo/alien/tcrdb/tcrdb.factor @@ -6,7 +6,7 @@ tokyo.alien.tctdb classes.struct ; IN: tokyo.alien.tcrdb << "tokyotyrant" { - { [ os macosx? ] [ "/opt/local/lib/libtokyotyrant.dylib" ] } + { [ os macosx? ] [ "libtokyotyrant.dylib" ] } { [ os unix? ] [ "libtokyotyrant.so" ] } { [ os windows? ] [ "tokyotyrant.dll" ] } } cond cdecl add-library >> diff --git a/extra/tokyo/alien/tcutil/tcutil.factor b/extra/tokyo/alien/tcutil/tcutil.factor index 54fe000df7..39c3ab331b 100644 --- a/extra/tokyo/alien/tcutil/tcutil.factor +++ b/extra/tokyo/alien/tcutil/tcutil.factor @@ -5,7 +5,7 @@ combinators kernel system ; IN: tokyo.alien.tcutil << "tokyocabinet" { - { [ os macosx? ] [ "/opt/local/lib/libtokyocabinet.dylib" ] } + { [ os macosx? ] [ "libtokyocabinet.dylib" ] } { [ os unix? ] [ "libtokyocabinet.so" ] } { [ os windows? ] [ "tokyocabinet.dll" ] } } cond cdecl add-library >>