aboutsummaryrefslogtreecommitdiffstats
path: root/tools/quilt
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-01-20 17:11:37 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-01-20 17:11:37 +0000
commit48a0e027885868a47408e1119b1b1636e4a2a48c (patch)
tree9206473dfa67b9e194060fca33f7c89ebef533e5 /tools/quilt
parent078481e37a033f1612a8631e986f7adeb4b22261 (diff)
downloadmaster-187ad058-48a0e027885868a47408e1119b1b1636e4a2a48c.tar.gz
master-187ad058-48a0e027885868a47408e1119b1b1636e4a2a48c.tar.bz2
master-187ad058-48a0e027885868a47408e1119b1b1636e4a2a48c.zip
[tools] quilt: make relocatable, search resources relative to STAGING_DIR
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29829 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/quilt')
-rw-r--r--tools/quilt/patches/000-relocatable.patch20
-rw-r--r--tools/quilt/patches/001-fix_compile.patch (renamed from tools/quilt/patches/000-fix_compile.patch)0
2 files changed, 20 insertions, 0 deletions
diff --git a/tools/quilt/patches/000-relocatable.patch b/tools/quilt/patches/000-relocatable.patch
new file mode 100644
index 0000000000..19ff5fd6ad
--- /dev/null
+++ b/tools/quilt/patches/000-relocatable.patch
@@ -0,0 +1,20 @@
+--- a/bin/quilt.in
++++ b/bin/quilt.in
+@@ -7,9 +7,15 @@
+ # See the COPYING and AUTHORS files for more details.
+
+ export TEXTDOMAIN=quilt
+-export TEXTDOMAINDIR=@LOCALEDIR@
+
+-: ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@}
++if test -n "$STAGING_DIR"; then
++ export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale"
++ : ${QUILT_DIR=$STAGING_DIR/../host/share/quilt} ${QUILT_LIB=$STAGING_DIR/../host/lib/quilt}
++else
++ export TEXTDOMAINDIR=@LOCALEDIR@
++ : ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@}
++fi
++
+ export QUILT_DIR QUILT_LIB
+
+ if [ -z "$QUILTRC" ]
diff --git a/tools/quilt/patches/000-fix_compile.patch b/tools/quilt/patches/001-fix_compile.patch
index 51a4f5e206..51a4f5e206 100644
--- a/tools/quilt/patches/000-fix_compile.patch
+++ b/tools/quilt/patches/001-fix_compile.patch