julia on mac can now be started from any directory

halleysfifthinc · May 14, 2011 · fa0f18d · fa0f18d
1 parent e5d38d1
commit fa0f18d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -8,8 +8,7 @@ debug release: %: julia-% j/pcre_h.j sys.ji custom.j
 
 julia-debug julia-release:
  $(MAKE) -C src lib$@
- ln -f src/lib$@.$(SHLIB_EXT) libjulia.$(SHLIB_EXT)
- ln -f src/lib$@.$(SHLIB_EXT) .
+ ln -f lib$@.$(SHLIB_EXT) libjulia.$(SHLIB_EXT)
  $(MAKE) -C ui $@
  ln -f ui/$@-$(DEFAULT_REPL) julia
  ln -f ui/$@-cloud .

diff --git a/src/Makefile b/src/Makefile
@@ -58,11 +58,11 @@ $(FLISP): $(FLISPDIR)/*.h $(FLISPDIR)/*.c $(LLT)
 
 libjulia-debug: libjulia-debug.$(SHLIB_EXT)
 libjulia-debug.$(SHLIB_EXT): $(DOBJS) $(LIBFILES)
- $(CXX) $(DEBUGFLAGS) $(DOBJS) -shared -o libjulia-debug.$(SHLIB_EXT) $(LIBS)
+ $(CXX) $(DEBUGFLAGS) $(DOBJS) -shared -o $(JULIAHOME)/libjulia-debug.$(SHLIB_EXT) $(LIBS)
 
 libjulia-release: libjulia-release.$(SHLIB_EXT)
 libjulia-release.$(SHLIB_EXT): $(OBJS) $(LIBFILES)
- $(CXX) $(SHIPFLAGS) $(OBJS) -shared -o libjulia-release.$(SHLIB_EXT) $(LIBS)
+ $(CXX) $(SHIPFLAGS) $(OBJS) -shared -o $(JULIAHOME)/libjulia-release.$(SHLIB_EXT) $(LIBS)
 
 
 debug release: %: julia-%