tools/quilt/patches/000-relocatable.patch

   1 --- a/bin/quilt.in
   2 +++ b/bin/quilt.in
   3 @@ -15,14 +15,22 @@ unset POSIXLY_CORRECT
   4  unset GREP_OPTIONS
   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 +       : ${QUILT_ETC=$STAGING_DIR/../host/etc}
  14 +else
  15 +       export TEXTDOMAINDIR=@LOCALEDIR@
  16 +       : ${QUILT_DIR=@QUILT_DIR@}
  17 +       : ${QUILT_ETC=@ETCDIR@}
  18 +fi
  19 +
  20  export QUILT_DIR
  21
  22  if [ -z "$QUILTRC" ]
  23  then
  24 -       for QUILTRC in $HOME/.quiltrc @ETCDIR@/quilt.quiltrc; do
  25 +       for QUILTRC in $HOME/.quiltrc $QUILT_ETC/quilt.quiltrc; do
  26                 [ -e $QUILTRC ] && break
  27         done
  28         export QUILTRC
  29 --- a/quilt/scripts/edmail.in
  30 +++ b/quilt/scripts/edmail.in
  31 @@ -29,7 +29,7 @@ BEGIN {
  32  }
  33
  34  setlocale(LC_MESSAGES, "");
  35 -bindtextdomain("quilt", "@LOCALEDIR@");
  36 +bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@");
  37  textdomain("quilt");
  38
  39  sub _($) {
  40 --- a/quilt/scripts/inspect.in
  41 +++ b/quilt/scripts/inspect.in
  42 @@ -6,7 +6,11 @@
  43  #
  44  #  See the COPYING and AUTHORS files for more details.
  45
  46 -: ${QUILT_DIR=@QUILT_DIR@}
  47 +if test -n "$STAGING_DIR"; then
  48 +       : ${QUILT_DIR="$STAGING_DIR/../host/share/quilt"}
  49 +else
  50 +       : ${QUILT_DIR=@QUILT_DIR@}
  51 +fi
  52
  53  if ! [ -r $QUILT_DIR/scripts/patchfns ]
  54  then
  55 --- a/quilt/scripts/patchfns.in
  56 +++ b/quilt/scripts/patchfns.in
  57 @@ -8,7 +8,11 @@
  58  #  See the COPYING and AUTHORS files for more details.
  59
  60  export TEXTDOMAIN=quilt
  61 -export TEXTDOMAINDIR=@LOCALEDIR@
  62 +if [ -n "$STAGING_DIR" ]; then
  63 +       export TEXTDOMAINDIR="$STAGING_DIR/../host/share/locale"
  64 +else
  65 +       export TEXTDOMAINDIR=@LOCALEDIR@
  66 +fi
  67
  68  : ${LC_CTYPE:=$LANG}
  69  : ${LC_MESSAGES:=$LANG}
  70 --- a/quilt/scripts/remove-trailing-ws.in
  71 +++ b/quilt/scripts/remove-trailing-ws.in
  72 @@ -31,7 +31,7 @@ BEGIN {
  73  }
  74
  75  setlocale(LC_MESSAGES, "");
  76 -bindtextdomain("quilt", "@LOCALEDIR@");
  77 +bindtextdomain("quilt", $ENV{'STAGING_DIR'} ? $ENV{'STAGING_DIR'} . '/../host/share/locale' : "@LOCALEDIR@");
  78  textdomain("quilt");
  79
  80  sub _($) {
  81 --- a/Makefile.in
  82 +++ b/Makefile.in
  83 @@ -21,8 +21,8 @@ COLUMN :=     @COLUMN@
  84  GETOPT :=      @GETOPT@
  85  CP :=          @CP@
  86  DATE :=                @DATE@
  87 -PERL :=                @PERL@
  88 -BASH :=                @BASH@
  89 +PERL :=                /usr/bin/env perl
  90 +BASH :=                /usr/bin/env bash
  91  SHELL:=                @BASH@ # It does not work if dash is used as a shell, for example
  92  GREP :=                @GREP@
  93  TAIL :=                @TAIL@
  94 @@ -32,7 +32,7 @@ AWK :=                @AWK@
  95  FIND :=                @FIND@
  96  XARGS :=       @XARGS@
  97  DIFF :=                @DIFF@
  98 -PATCH :=       @PATCH@
  99 +PATCH :=       /usr/bin/env patch
 100  MKTEMP :=      @MKTEMP@
 101  MSGMERGE :=    @MSGMERGE@
 102  MSGFMT :=      @MSGFMT@
 103 @@ -49,8 +49,8 @@ USE_NLS :=    @USE_NLS@
 104  STAT_HARDLINK := @STAT_HARDLINK@
 105  PATCH_WRAPPER := @PATCH_WRAPPER@
 106
 107 -COMPAT_SYMLINKS        := @COMPAT_SYMLINKS@
 108 -COMPAT_PROGRAMS        := @COMPAT_PROGRAMS@
 109 +COMPAT_SYMLINKS        :=
 110 +COMPAT_PROGRAMS        :=
 111
 112  default: all
 113
 114 --- a/quilt/scripts/backup-files.in
 115 +++ b/quilt/scripts/backup-files.in
 116 @@ -53,7 +53,12 @@ usage ()
 117  "
 118  }
 119
 120 -: ${QUILT_DIR=@QUILT_DIR@}
 121 +if test -n "$STAGING_DIR"; then
 122 +       : ${QUILT_DIR="$STAGING_DIR/../host/share/quilt"}
 123 +else
 124 +       : ${QUILT_DIR=@QUILT_DIR@}
 125 +fi
 126 +
 127  . $QUILT_DIR/scripts/utilfns
 128
 129  ensure_nolinks()