diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-09-24 20:01:03 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-09-24 20:01:03 +0000 |
| commit | 5166bb0b1bca795ce53157f32f81b3c7c9b5e555 (patch) | |
| tree | ab823ea30f98e063a17dcb670386459fd7b60566 /tools/quilt/patches/000-relocatable.patch | |
| parent | 948f060014e1ecf1d5c95ecb14320d1deeead32b (diff) | |
| download | upstream-5166bb0b1bca795ce53157f32f81b3c7c9b5e555.tar.gz upstream-5166bb0b1bca795ce53157f32f81b3c7c9b5e555.tar.bz2 upstream-5166bb0b1bca795ce53157f32f81b3c7c9b5e555.zip | |
quilt: update to 0.60
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38170
Diffstat (limited to 'tools/quilt/patches/000-relocatable.patch')
| -rw-r--r-- | tools/quilt/patches/000-relocatable.patch | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/tools/quilt/patches/000-relocatable.patch b/tools/quilt/patches/000-relocatable.patch index f8110236a6..dab42c2f4c 100644 --- a/tools/quilt/patches/000-relocatable.patch +++ b/tools/quilt/patches/000-relocatable.patch @@ -1,21 +1,21 @@ --- a/bin/quilt.in +++ b/bin/quilt.in -@@ -7,9 +7,15 @@ - # See the COPYING and AUTHORS files for more details. +@@ -11,9 +11,15 @@ + unset POSIXLY_CORRECT export TEXTDOMAIN=quilt -export TEXTDOMAINDIR=@LOCALEDIR@ --: ${QUILT_DIR=@QUILT_DIR@} ${QUILT_LIB=@QUILT_LIB@} +-: ${QUILT_DIR=@QUILT_DIR@} +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@} ++ : ${QUILT_DIR=@QUILT_DIR@} +fi + - export QUILT_DIR QUILT_LIB + export QUILT_DIR if [ -z "$QUILTRC" ] --- a/quilt/scripts/edmail.in @@ -44,20 +44,9 @@ if ! [ -r $QUILT_DIR/scripts/patchfns ] then ---- a/quilt/scripts/parse-patch.in -+++ b/quilt/scripts/parse-patch.in -@@ -34,7 +34,7 @@ BEGIN { - } - - setlocale(LC_MESSAGES, ""); --bindtextdomain("quilt", "@LOCALEDIR@"); -+bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@"); - textdomain("quilt"); - - sub _($) { --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in -@@ -10,7 +10,11 @@ +@@ -8,7 +8,11 @@ # See the COPYING and AUTHORS files for more details. export TEXTDOMAIN=quilt |