From caa9e0e0f36b9c406375ae05d7a8fe9c850df51f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 20 Jan 2012 17:11:37 +0000 Subject: [PATCH] quilt: make relocatable, search resources relative to STAGING_DIR SVN-Revision: 29829 --- tools/quilt/patches/000-relocatable.patch | 20 +++++++++++++++++++ ...ix_compile.patch => 001-fix_compile.patch} | 0 2 files changed, 20 insertions(+) create mode 100644 tools/quilt/patches/000-relocatable.patch rename tools/quilt/patches/{000-fix_compile.patch => 001-fix_compile.patch} (100%) 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 similarity index 100% rename from tools/quilt/patches/000-fix_compile.patch rename to tools/quilt/patches/001-fix_compile.patch -- 2.25.1