diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-21 13:22:55 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-21 14:04:54 +0200 |
| commit | 2ab165cae7c9612409aabe0d9068e8e84c94502c (patch) | |
| tree | 47ac6b925fb639612e14115b371e816b808a016d | |
| parent | 7744a665990d762c0b521e78c398087c0e4edebf (diff) | |
| download | ptxdist-2ab165cae7c9612409aabe0d9068e8e84c94502c.tar.gz ptxdist-2ab165cae7c9612409aabe0d9068e8e84c94502c.tar.xz | |
[arora] correct install prefix handling
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/arora-0.10.2/fix-prefix.diff | 27 | ||||
| -rw-r--r-- | patches/arora-0.10.2/series | 1 | ||||
| -rw-r--r-- | rules/arora.make | 3 |
3 files changed, 1 insertions, 30 deletions
diff --git a/patches/arora-0.10.2/fix-prefix.diff b/patches/arora-0.10.2/fix-prefix.diff deleted file mode 100644 index 5f13542fb..000000000 --- a/patches/arora-0.10.2/fix-prefix.diff +++ /dev/null @@ -1,27 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Subject: fix prefix - -arora installs to /usr/local by default. -This patch changes this to /usr. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- -# 20091210 rsc: is this patch ready for upstream, or should it be solved -# differently? - - install.pri | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/install.pri -=================================================================== ---- a/install.pri -+++ b/install.pri -@@ -1,7 +1,7 @@ - - unix { - isEmpty(PREFIX) { -- PREFIX = /usr/local -+ PREFIX = /usr - } - BINDIR = $$PREFIX/bin - diff --git a/patches/arora-0.10.2/series b/patches/arora-0.10.2/series index 2bb06a61a..e7b0e4083 100644 --- a/patches/arora-0.10.2/series +++ b/patches/arora-0.10.2/series @@ -1,2 +1 @@ -fix-prefix.diff add-missing-include.diff diff --git a/rules/arora.make b/rules/arora.make index 36654ab31..44be5080c 100644 --- a/rules/arora.make +++ b/rules/arora.make @@ -36,8 +36,7 @@ $(ARORA_SOURCE): # Prepare # ---------------------------------------------------------------------------- -ARORA_PATH := PATH=$(CROSS_PATH) -ARORA_CONF_ENV := $(CROSS_ENV) +ARORA_CONF_OPT := $(CROSS_QMAKE_OPT) PREFIX=/usr # ---------------------------------------------------------------------------- # Target-Install |