Fixed make extra in cross-compile.

diff --git a/Darwin-arm.mk b/Darwin-arm.mk
index abf2a4e3be32059f2d61bf459f4f96f93cfe58f8..c1858fe7fa96a402b7e5d316042083092ca48921 100644 (file)
--- a/Darwin-arm.mk
+++ b/Darwin-arm.mk
@@ -23,11 +23,5 @@ extra:
        mkdir -p package/System/Library/LaunchDaemons
        #cp -a com.saurik.Cyrver.plist package/System/Library/LaunchDaemons
        mkdir -p package/Library/MobileSubstrate/DynamicLibraries
        mkdir -p package/System/Library/LaunchDaemons
        #cp -a com.saurik.Cyrver.plist package/System/Library/LaunchDaemons
        mkdir -p package/Library/MobileSubstrate/DynamicLibraries

-       if [[ -e Settings.plist ]]; then \
-           mkdir -p package/Library/PreferenceLoader/Preferences; \
-           cp -a Settings.png package/Library/PreferenceLoader/Preferences/CycriptIcon.png; \
-           cp -a Settings.plist package/Library/PreferenceLoader/Preferences/Cycript.plist; \
-       fi
-       if [[ -e Tweak.plist ]]; then cp -a Tweak.plist package/Library/MobileSubstrate/DynamicLibraries/Cycript.plist; fi

        cp -a Cycript.$(dll) package/Library/MobileSubstrate/DynamicLibraries
 
        cp -a Cycript.$(dll) package/Library/MobileSubstrate/DynamicLibraries
 

diff --git a/iPhone.mk b/iPhone.mk
index ac6ab20142449c4cc2b42fd56c87a43451dc5e13..296636c151e90873dbe72dc7ef9028d43d4652b4 100644 (file)
--- a/iPhone.mk
+++ b/iPhone.mk
@@ -1,4 +1,5 @@
 uname_s := Darwin
 uname_p := arm
 paths := ~/menes/mobilesubstrate
 uname_s := Darwin
 uname_p := arm
 paths := ~/menes/mobilesubstrate

+restart := ./iPhone.sh

 include makefile
 include makefile

diff --git a/iPhone.sh b/iPhone.sh
index 7422689f5f9a655194709d4df17087a29cd5a638..982a87033326eadb94a2fe2adad648fa5ff9a19b 100755 (executable)
--- a/iPhone.sh
+++ b/iPhone.sh
@@ -1 +1,2 @@
-PKG_ARCH=iphoneos-arm /apl/tel/exec.sh :apr-lib:libffi:readline:sqlite3 make -f iPhone.mk
+#!/usr/bin/env bash
+PKG_ARCH=iphoneos-arm /apl/tel/exec.sh :apr-lib:libffi:readline:sqlite3 make -f iPhone.mk "$@"

diff --git a/makefile b/makefile
index c98d7eaf8c09fad6700b31fcd402201e4f9882c6..eab95c0e85f5bc88d7676bd39ad588bee1d4dbea 100644 (file)
--- a/makefile
+++ b/makefile
@@ -35,13 +35,9 @@ library := $(apr) -lffi -lsqlite3
 console := $(apr) -lreadline
 depends :=
 
 console := $(apr) -lreadline
 depends :=
 

-ifndef uname_s
-uname_s := $(shell uname -s)
-endif
-
-ifndef uname_p
-uname_p := $(shell uname -p)
-endif
+restart ?= $(MAKE)
+uname_s ?= $(shell uname -s)
+uname_p ?= $(shell uname -p)

 
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk


@@ -71,7 +67,7 @@ $(deb): $(all)
        rm -rf package
        mkdir -p package/DEBIAN
        sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' control >package/DEBIAN/control
        rm -rf package
        mkdir -p package/DEBIAN
        sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' control >package/DEBIAN/control

-       $(MAKE) extra
+       $(restart) extra

        mkdir -p package/usr/{bin,lib,sbin}
        cp -a libcycript.$(dll) package/usr/lib
        cp -a cycript package/usr/bin
        mkdir -p package/usr/{bin,lib,sbin}
        cp -a libcycript.$(dll) package/usr/lib
        cp -a cycript package/usr/bin