Support Fink from old build.

diff --git a/Darwin-arm.mk b/Darwin-arm.mk
index cc970778984f81250b4e5913868d4fb9a78485a0..eb9affa3dfefc7fb4b7f7defb65fa74f0d83ca5c 100644 (file)
--- a/Darwin-arm.mk
+++ b/Darwin-arm.mk
@@ -2,6 +2,8 @@ flags += -F${PKG_ROOT}/System/Library/PrivateFrameworks
 
 all += #cyrver
 
 
 all += #cyrver
 

+prefix := /usr
+

 arch := iphoneos-arm
 console += -framework UIKit
 depends += apr-lib readline libffi mobilesubstrate
 arch := iphoneos-arm
 console += -framework UIKit
 depends += apr-lib readline libffi mobilesubstrate

diff --git a/Darwin.mk b/Darwin.mk
index 20cff9b6c6e1176b9806ba6748eedc8c3a4a86ca..b4f6b503045a6f767812ffae46c7f428a3e68171 100644 (file)
--- a/Darwin.mk
+++ b/Darwin.mk
@@ -1,7 +1,7 @@
 dll := dylib
 link += -lobjc -framework CoreFoundation
 console += -framework Foundation
 dll := dylib
 link += -lobjc -framework CoreFoundation
 console += -framework Foundation

-library += -install_name /usr/lib/libcycript.$(dll)
+library += -install_name $(prefix)/lib/libcycript.$(dll)

 library += -framework Foundation
 console += -framework JavaScriptCore
 # XXX: do I just need WebCore?
 library += -framework Foundation
 console += -framework JavaScriptCore
 # XXX: do I just need WebCore?


@@ -12,7 +12,9 @@ flags += -I/usr/include/ffi
 apr_config := /usr/bin/apr-1-config
 flags += -arch i386 -arch x86_64 #-arch armv6
 
 apr_config := /usr/bin/apr-1-config
 flags += -arch i386 -arch x86_64 #-arch armv6
 

-flags += -DCY_ATTACH -DCY_LIBRARY='"/usr/lib/libcycript.dylib"'
+prefix := /sw
+
+flags += -DCY_ATTACH -DCY_LIBRARY='"$(prefix)/lib/libcycript.dylib"'

 code += Handler.o
 inject += Mach/Inject.o
 Mach/Inject.o: Trampoline.t.hpp Baton.hpp
 code += Handler.o
 inject += Mach/Inject.o
 Mach/Inject.o: Trampoline.t.hpp Baton.hpp

diff --git a/makefile b/makefile
index cf4e76975fae2e033d3979414b83653eb8f9ced2..7937141ed8f6b8f3744b2557d53e11afa5631911 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,6 +6,8 @@ else
 target := $(PKG_TARG)-
 endif
 
 target := $(PKG_TARG)-
 endif
 

+prefix := /usr
+

 gcc := g++
 flags ?= -g3 -O0 -DYYDEBUG=1
 
 gcc := g++
 flags ?= -g3 -O0 -DYYDEBUG=1
 


@@ -101,11 +103,11 @@ $(deb): $(all) control
        rm -rf package
        mkdir -p package/DEBIAN
        cp -pR control package/DEBIAN
        rm -rf package
        mkdir -p package/DEBIAN
        cp -pR control package/DEBIAN

-       mkdir -p package/usr/{bin,lib,sbin}
+       mkdir -p package$(prefix)/{bin,lib,sbin}

        $(restart) extra
        $(restart) extra

-       cp -pR $(lib)cycript.$(dll) package/usr/lib
-       cp -pR cycript package/usr/bin
-       #cp -pR cyrver package/usr/sbin
+       cp -pR $(lib)cycript.$(dll) package$(prefix)/lib
+       cp -pR cycript package$(prefix)/bin
+       #cp -pR cyrver package$(prefix)/sbin

        dpkg-deb -b package $(deb)
 endif
 
        dpkg-deb -b package $(deb)
 endif