OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 --- a/lib/et/compile_et.sh.in 1 --- a/lib/et/compile_et.sh.in
2 +++ b/lib/et/compile_et.sh.in 2 +++ b/lib/et/compile_et.sh.in
3 @@ -2,8 +2,14 @@ 3 @@ -2,9 +2,15 @@
4 # 4 #
5 # 5 #
Line -... Line 6...
-   6
6 7 -datarootdir=@datarootdir@
7 -AWK=@AWK@ 8 -AWK=@AWK@
8 -DIR=@datadir@/et 9 -DIR=@datadir@/et
-   10 +if test "x$STAGING_DIR" = x ; then
9 +if test "x$STAGING_DIR" = x ; then 11 + datarootdir=@datarootdir@
10 + AWK=@AWK@ 12 + AWK=@AWK@
11 + DIR=@datadir@/et 13 + DIR=@datadir@/et
-   14 +else
12 +else 15 + datarootdir="$STAGING_DIR/../hostpkg/share"
13 + AWK=awk 16 + AWK=awk
14 + DIR="$STAGING_DIR/../hostpkg/share/et" 17 + DIR="$datarootdir/et"
15 +fi -  
Line 16... Line 18...
16 + 18 +fi
17 19
18 if test "$1" = "--build-tree" ; then 20 if test "$1" = "--build-tree" ; then
19 shift; 21 shift;
20 --- a/lib/ss/mk_cmds.sh.in 22 --- a/lib/ss/mk_cmds.sh.in
-   23 +++ b/lib/ss/mk_cmds.sh.in
21 +++ b/lib/ss/mk_cmds.sh.in 24 @@ -1,11 +1,17 @@
22 @@ -2,10 +2,16 @@ 25 #!/bin/sh
23 # 26 #
-   27 #
24 # 28 -
25 29 -datarootdir=@datarootdir@
26 -DIR=@datadir@/ss 30 -DIR=@datadir@/ss
27 -AWK=@AWK@ -  
28 SED=sed 31 -AWK=@AWK@
-   32 -SED=@SED@
29 33 +if test "x$STAGING_DIR" = x ; then
30 +if test "x$STAGING_DIR" = x ; then 34 + datarootdir=@datarootdir@
-   35 + DIR=@datadir@/ss
31 + DIR=@datadir@/ss 36 + AWK=@AWK@
32 + AWK=@AWK@ 37 + SED=@SED@
-   38 +else
33 +else 39 + datarootdir="$STAGING_DIR/../hostpkg/share"
-   40 + DIR="$datarootdir/ss"
34 + DIR="$STAGING_DIR/../hostpkg/share/ss" 41 + AWK=awk
35 + AWK=awk 42 + SED=sed
36 +fi 43 +fi
37 + 44
38 for as_var in \ -