Changeset 29834
- Timestamp:
- 2012-01-20T18:54:43+01:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/tools/quilt/patches/000-relocatable.patch
r29829 r29834 19 19 20 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/parse-patch.in 48 +++ b/quilt/scripts/parse-patch.in 49 @@ -34,7 +34,7 @@ BEGIN { 50 } 51 52 setlocale(LC_MESSAGES, ""); 53 -bindtextdomain("quilt", "@LOCALEDIR@"); 54 +bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@"); 55 textdomain("quilt"); 56 57 sub _($) { 58 --- a/quilt/scripts/patchfns.in 59 +++ b/quilt/scripts/patchfns.in 60 @@ -10,7 +10,11 @@ 61 # See the COPYING and AUTHORS files for more details. 62 63 export TEXTDOMAIN=quilt 64 -export TEXTDOMAINDIR=@LOCALEDIR@ 65 +if [ -n "$STAGING_DIR" ]; then 66 + export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale" 67 +else 68 + export TEXTDOMAINDIR=@LOCALEDIR@ 69 +fi 70 71 : ${LC_CTYPE:=$LANG} 72 : ${LC_MESSAGES:=$LANG} 73 --- a/quilt/scripts/remove-trailing-ws.in 74 +++ b/quilt/scripts/remove-trailing-ws.in 75 @@ -31,7 +31,7 @@ BEGIN { 76 } 77 78 setlocale(LC_MESSAGES, ""); 79 -bindtextdomain("quilt", "@LOCALEDIR@"); 80 +bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@"); 81 textdomain("quilt"); 82 83 sub _($) {
Note: See TracChangeset
for help on using the changeset viewer.