Rewrite the library paths on OS X before creating the dmg for JuliaGr…

…aphics/Winston.jl#60

contrib/mac/app/Makefile

@@ -5,7 +5,7 @@
 JULIAHOME = $(abspath ../../..)
 include ../../../Make.inc
 
-all: clean dmg rewritepaths
+all: clean dmg
 
 dmg:
 	make -C ../../../deps install-git
@@ -19,16 +19,15 @@ dmg:
 	cp -a ~/.julia/Tk/deps/usr/* ./julia/
 	rm -f julia/lib/*.{a,la}
 	chmod a+w julia/lib/*.dylib
+	(for lib in julia/lib/*.dylib; do ./run-install-name-tool-change.sh $$lib $$HOME/.julia/Cairo/deps/usr/lib/ lib/ change; done)
+	(for lib in julia/lib/*.dylib; do ./run-install-name-tool-change.sh $$lib $$HOME/.julia/Tk/deps/usr/lib/ lib/ change; done)
+	(cd julia/lib && for lib in *.dylib; do install_name_tool -id @executable_path/../lib/$$lib $$lib; done)
 	-mkdir dmg
 	platypus -a Julia -p /bin/bash -V $(JULIA_VERSION) -u "The Julia Project" -i julia.icns -Q julia.icns -o "None" -I org.julialang -x -f julia script ./dmg/Julia-$(JULIA_VERSION)-pre-$(JULIA_COMMIT).app
 	-cp -f Julia.icns dmg/.VolumeIcon.icns
 	-ln -fs /Applications ./dmg/Applications
 	hdiutil create Julia-$(JULIA_VERSION)-pre-$(JULIA_COMMIT).dmg -ov -volname "Julia" -imagekey zlib-level=9 -srcfolder dmg
 
-rewritepaths:
-	(for lib in julia/lib/*.dylib; do ./run-install-name-tool-change.sh $$lib $$HOME/.julia/Cairo/deps/usr/lib/ lib/ change; done)
-	(for lib in julia/lib/*.dylib; do ./run-install-name-tool-change.sh $$lib $$HOME/.julia/Tk/deps/usr/lib/ lib/ change; done)
-	(cd julia/lib && for lib in *.dylib; do install_name_tool -id @executable_path/../lib/$$lib $$lib; done)
 
 clean:
 	rm -fr julia dmg *.dmg