From f37e350174fca2296b6052746d6e0a9796ad67cb Mon Sep 17 00:00:00 2001
From: "Jay Freeman (saurik)" <saurik@saurik.com>
Date: Thu, 22 Oct 2009 09:56:59 +0000
Subject: [PATCH] Fixed packaging on Linux.

---
 Darwin-arm.mk | 14 ++++++++++++++
 Linux.mk      |  1 +
 control       |  4 ++--
 makefile      | 22 ++++++++--------------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/Darwin-arm.mk b/Darwin-arm.mk
index 974a576..0d150de 100644
--- a/Darwin-arm.mk
+++ b/Darwin-arm.mk
@@ -5,6 +5,7 @@ all += Cycript.$(dll) #cyrver
 arch := iphoneos-arm
 ldid := ldid -S
 console += -framework UIKit
+depends += readline libffi mobilesubstrate
 
 Cycript.$(dll): Connector.o
 	$(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
@@ -16,3 +17,16 @@ cyrver: Server.o
 	$(target)g++ $(flags) -o $@ $(filter %.o,$^) \
 	    -lapr-1 -lsubstrate -framework CFNetwork
 	$(ldid) $@
+
+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/Linux.mk b/Linux.mk
index 6c1906b..26b27ed 100644
--- a/Linux.mk
+++ b/Linux.mk
@@ -1,2 +1,3 @@
 export PATH := /usr/local/bin:$(PATH)
 flags += -I/usr/include/webkit-1.0
+depends += libffi4 libreadline5
diff --git a/control b/control
index a072e6a..fbea69e 100644
--- a/control
+++ b/control
@@ -2,11 +2,11 @@ Package: cycript
 Priority: optional
 Section: Development
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
-Architecture: iphoneos-arm
+Architecture: %
 Version: 0.9.#-1
 Description: runtime execution server and disassembler
 Name: Cycript
-Depends: mobilesubstrate (>= 0.9.3005-1), readline, libffi
+Depends: &
 Author: Jay Freeman (saurik) <saurik@saurik.com>
 Depiction: http://cydia.saurik.com/info/cycript/
 Tag: purpose::daemon, role::developer
diff --git a/makefile b/makefile
index ce70b55..2cd6880 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-SHELL :=$(shell which bash 2>/dev/null)
+SHELL := $(shell which bash 2>/dev/null)
 
 ifndef PKG_TARG
 target :=
@@ -6,8 +6,8 @@ else
 target := $(PKG_TARG)-
 endif
 
-#flags := -g3 -O0 -DYYDEBUG=1
-flags := -g0 -O3
+flags := -g3 -O0 -DYYDEBUG=1
+#flags := -g0 -O3
 flags += -Wall -Werror -Wno-parentheses
 flags += -fPIC -fno-common
 flags += -I. -I$(shell apr-1-config --includedir)
@@ -34,6 +34,7 @@ dll := so
 apr := $(shell apr-1-config --link-ld)
 library := $(apr) -lffi
 console := $(apr) -lreadline
+depends :=
 
 uname_s := $(shell uname -s)
 uname_p := $(shell uname -p)
@@ -47,20 +48,13 @@ deb := $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version:
 
 all: $(deb)
 
+extra:
+
 $(deb): $(all)
 	rm -rf package
 	mkdir -p package/DEBIAN
-	sed -e 's/#/$(svn)/' control >package/DEBIAN/control
-	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
+	sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' control >package/DEBIAN/control
+	$(MAKE) extra
 	mkdir -p package/usr/{bin,lib,sbin}
 	cp -a libcycript.$(dll) package/usr/lib
 	cp -a cycript package/usr/bin
-- 
2.45.2