From fb81b01c0be92176b49f721a3111a167210739f0 Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Sat, 31 Oct 2009 00:05:01 +0000
Subject: [PATCH] Fixed make extra in cross-compile.

---
 Darwin-arm.mk |  6 ------
 iPhone.mk     |  1 +
 iPhone.sh     |  3 ++-
 makefile      | 12 ++++--------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/Darwin-arm.mk b/Darwin-arm.mk
index abf2a4e..c1858fe 100644
--- 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
-	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
 
diff --git a/iPhone.mk b/iPhone.mk
index ac6ab20..296636c 100644
--- a/iPhone.mk
+++ b/iPhone.mk
@@ -1,4 +1,5 @@
 uname_s := Darwin
 uname_p := arm
 paths := ~/menes/mobilesubstrate
+restart := ./iPhone.sh
 include makefile
diff --git a/iPhone.sh b/iPhone.sh
index 7422689..982a870 100755
--- 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 c98d7ea..eab95c0 100644
--- a/makefile
+++ b/makefile
@@ -35,13 +35,9 @@ library := $(apr) -lffi -lsqlite3
 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
@@ -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
-	$(MAKE) extra
+	$(restart) extra
 	mkdir -p package/usr/{bin,lib,sbin}
 	cp -a libcycript.$(dll) package/usr/lib
 	cp -a cycript package/usr/bin
-- 
2.45.2