From 049dbd024c302073d68e79c4d2531b73d57395d0 Mon Sep 17 00:00:00 2001 From: Alex Shinn Date: Thu, 6 Mar 2014 22:21:40 +0900 Subject: [PATCH] Setting the install_path so you can run the installed chibi-scheme on OS X without having the library in DYLD_LIBRARY_PATH. Fixes issue #213. --- Makefile | 2 +- Makefile.detect | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dea064fc..59743f32 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ CHIBI_DOC_DEPENDENCIES ?= $(CHIBI_DEPENDENCIES) tools/chibi-doc GENSTATIC ?= ./tools/chibi-genstatic -CHIBI ?= LD_LIBRARY_PATH=".:$(LD_LIBRARY_PATH)" CHIBI_MODULE_PATH=lib ./chibi-scheme$(EXE) +CHIBI ?= LD_LIBRARY_PATH=".:$(LD_LIBRARY_PATH)" DYLD_LIBRARY_PATH=".:$(DYLD_LIBRARY_PATH)" CHIBI_MODULE_PATH=lib ./chibi-scheme$(EXE) CHIBI_DEPENDENCIES = ./chibi-scheme$(EXE) ######################################################################## diff --git a/Makefile.detect b/Makefile.detect index 7357130a..cb78d7c0 100644 --- a/Makefile.detect +++ b/Makefile.detect @@ -53,6 +53,7 @@ EXE = CLIBFLAGS = CLINKFLAGS = -dynamiclib STATICFLAGS = -static-libgcc -DSEXP_USE_DL=0 +LDFLAGS += -install_name $(DESTDIR)$(SOLIBDIR)/libchibi-scheme.dylib else ifeq ($(PLATFORM),bsd) SO = .so