diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 17:54:43 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-01-20 17:54:43 +0000 |
| commit | 4056309bad129310f383aedff458b37e69f4c863 (patch) | |
| tree | 71f250444a46f5879519537701a9299b52d2874a /tools | |
| parent | 6a960b674d70f0f4d28c94c0ef4fdaf1ff1954b8 (diff) | |
| download | upstream-4056309bad129310f383aedff458b37e69f4c863.tar.gz upstream-4056309bad129310f383aedff458b37e69f4c863.tar.bz2 upstream-4056309bad129310f383aedff458b37e69f4c863.zip | |
[tools] quilt: some more relocatable fixes for quilt-internal scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29834 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/quilt/patches/000-relocatable.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/tools/quilt/patches/000-relocatable.patch b/tools/quilt/patches/000-relocatable.patch index 19ff5fd6ad..f8110236a6 100644 --- a/tools/quilt/patches/000-relocatable.patch +++ b/tools/quilt/patches/000-relocatable.patch @@ -18,3 +18,66 @@ export QUILT_DIR QUILT_LIB if [ -z "$QUILTRC" ] +--- a/quilt/scripts/edmail.in ++++ b/quilt/scripts/edmail.in +@@ -29,7 +29,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/inspect.in ++++ b/quilt/scripts/inspect.in +@@ -6,7 +6,11 @@ + # + # See the COPYING and AUTHORS files for more details. + +-: ${QUILT_DIR=@QUILT_DIR@} ++if test -n "$STAGING_DIR"; then ++ : ${QUILT_DIR="$STAGING_DIR/../host/share/quilt"} ++else ++ : ${QUILT_DIR=@QUILT_DIR@} ++fi + + 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 @@ + # See the COPYING and AUTHORS files for more details. + + export TEXTDOMAIN=quilt +-export TEXTDOMAINDIR=@LOCALEDIR@ ++if [ -n "$STAGING_DIR" ]; then ++ export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale" ++else ++ export TEXTDOMAINDIR=@LOCALEDIR@ ++fi + + : ${LC_CTYPE:=$LANG} + : ${LC_MESSAGES:=$LANG} +--- a/quilt/scripts/remove-trailing-ws.in ++++ b/quilt/scripts/remove-trailing-ws.in +@@ -31,7 +31,7 @@ BEGIN { + } + + setlocale(LC_MESSAGES, ""); +-bindtextdomain("quilt", "@LOCALEDIR@"); ++bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@"); + textdomain("quilt"); + + sub _($) { |