[tools] quilt: update to 0.60
[openwrt.git] / tools / quilt / patches / 000-relocatable.patch
1 --- a/bin/quilt.in
2 +++ b/bin/quilt.in
3 @@ -11,9 +11,15 @@
4  unset POSIXLY_CORRECT
5  
6  export TEXTDOMAIN=quilt
7 -export TEXTDOMAINDIR=@LOCALEDIR@
8  
9 -: ${QUILT_DIR=@QUILT_DIR@}
10 +if test -n "$STAGING_DIR"; then
11 +       export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale"
12 +       : ${QUILT_DIR=$STAGING_DIR/../host/share/quilt} ${QUILT_LIB=$STAGING_DIR/../host/lib/quilt}
13 +else
14 +       export TEXTDOMAINDIR=@LOCALEDIR@
15 +       : ${QUILT_DIR=@QUILT_DIR@}
16 +fi
17 +
18  export QUILT_DIR
19  
20  if [ -z "$QUILTRC" ]
21 --- a/quilt/scripts/edmail.in
22 +++ b/quilt/scripts/edmail.in
23 @@ -29,7 +29,7 @@ BEGIN {
24  }
25  
26  setlocale(LC_MESSAGES, "");
27 -bindtextdomain("quilt", "@LOCALEDIR@");
28 +bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@");
29  textdomain("quilt");
30  
31  sub _($) {
32 --- a/quilt/scripts/inspect.in
33 +++ b/quilt/scripts/inspect.in
34 @@ -6,7 +6,11 @@
35  #
36  #  See the COPYING and AUTHORS files for more details.
37  
38 -: ${QUILT_DIR=@QUILT_DIR@}
39 +if test -n "$STAGING_DIR"; then
40 +       : ${QUILT_DIR="$STAGING_DIR/../host/share/quilt"}
41 +else
42 +       : ${QUILT_DIR=@QUILT_DIR@}
43 +fi
44  
45  if ! [ -r $QUILT_DIR/scripts/patchfns ]
46  then
47 --- a/quilt/scripts/patchfns.in
48 +++ b/quilt/scripts/patchfns.in
49 @@ -8,7 +8,11 @@
50  #  See the COPYING and AUTHORS files for more details.
51  
52  export TEXTDOMAIN=quilt
53 -export TEXTDOMAINDIR=@LOCALEDIR@
54 +if [ -n "$STAGING_DIR" ]; then
55 +       export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale"
56 +else
57 +       export TEXTDOMAINDIR=@LOCALEDIR@
58 +fi
59  
60  : ${LC_CTYPE:=$LANG}
61  : ${LC_MESSAGES:=$LANG}
62 --- a/quilt/scripts/remove-trailing-ws.in
63 +++ b/quilt/scripts/remove-trailing-ws.in
64 @@ -31,7 +31,7 @@ BEGIN {
65  }
66  
67  setlocale(LC_MESSAGES, "");
68 -bindtextdomain("quilt", "@LOCALEDIR@");
69 +bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@");
70  textdomain("quilt");
71  
72  sub _($) {