[Libreoffice-commits] .: set_soenv.in

Tor Lillqvist tml at kemper.freedesktop.org
Mon Jul 25 06:12:58 PDT 2011


 set_soenv.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 73fc9f26794641246b7ffae637a69b528a4e13ab
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jul 25 16:09:45 2011 +0300

    Revert "no need for INPATH in WORKDIR anymore"
    
    We do need to have the platform-specific part in WORKDIR, for
    cross-compilation support.
    
    This reverts commit 3c471c4a11fe58a6cd3dbf09099d9a1ecf60dd38.

diff --git a/set_soenv.in b/set_soenv.in
index 9c1a083..ebfad11 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -956,7 +956,7 @@ else
 $SOLARVERSION         = '$SOLARVER';
 
 #Location of gnu make directories.
-$WORKDIR              = '$SRC_ROOT/workdir';
+$WORKDIR              = '$SRC_ROOT/workdir/$INPATH';
 $OUTDIR              = '$SOLARVER/$INPATH';
 #Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
 $SOLARDEFIMG          = PathFormat($SRC_ROOT.$DEFIMGS);


More information about the Libreoffice-commits mailing list