[Libreoffice-commits] .: Branch 'feature/soenv' - configure.in solenv/inc

[Norbert Thiebaud]

 configure.in           |    2 -
 solenv/inc/unitools.mk |   55 +++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 45 insertions(+), 12 deletions(-)

New commits:
commit feb4772b32d0d86e03789eef6e3adb1f22ad48c5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Nov 22 21:16:46 2011 -0600

    fix issues for set_soenv removal found on MacOSX

diff --git a/configure.in b/configure.in
index e36128e..6c1bfb4 100644
--- a/configure.in
+++ b/configure.in
@@ -4895,7 +4895,7 @@ if test "$SOLAR_JAVA" != ""; then
 
     darwin*)
         x_JAVALIB=[\#]
-        SOLARINC="$SOLARINC -I $FRAMEWORKSHOME/JavaVM.framework/Version/Current/Headers -I $FRAMEWORKHOME/JavaVM/Headers"
+        SOLARINC="$SOLARINC -I$FRAMEWORKSHOME/JavaVM.framework/Versions/Current/Headers"
         ;;
 
     dragonfly*)
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 6d7ef05..b889e35 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -59,6 +59,7 @@ EES:=
 # USQ .. unix shell  quote
 EMQ:=\\
 USQ:="
+# "
 
 NULLDEV:=/dev/null
 
@@ -92,11 +93,21 @@ FIND*=find
 .IF "$(OS_FOR_BUILD)"=="WNT"
 FLIPCMD*=$(PERL) $(SOLARENV)/bin/slfl.pl
 .ENDIF
-GNUCOPY*=cp
-GNUMAKE*=make
-GREP*=grep
-LS*=ls
-PERL*:=perl
+.IF "$(GNUCOPY)"==""
+GNUCOPY=cp
+.ENDIF
+.IF "$(GNUMAKE)"==""
+GNUMAKE=make
+.ENDIF
+.IF "$(GREP)"==""
+GREP=grep
+.ENDIF
+.IF "$(LS)"==""
+LS=ls
+.ENDIF
+.IF "$(PERL)"==""
+PERL:=perl
+.ENDIF
 .EXPORT : PERL
 RENAME*=mv
 TOUCH*=touch
@@ -119,16 +130,32 @@ COPYRECURSE=-r
 .ENDIF
 .IF "$(OS)"=="SOLARIS"
 AWK*=nawk
-GNUCOPY*=/usr/gnu/bin/cp
+.IF "$(GNUCOPY)"==""
+GNUCOPY=/usr/gnu/bin/cp
+.ENDIF
+.IF "$(GNUPATCH)"==""
 GNUPATCH*=/usr/gnu/bin/patch
-GNUTAR*=/usr/sfw/bin/gtar
+.ENDIF
+.IF "$(GNUTAR)"==""
+GNUTAR=/usr/sfw/bin/gtar
+.ENDIF
+.IF "$(GNUMAKE)"==""
 GNUMAKE=/usr/sfw/bin/make
+.ENDIF
 DEREFERENCE=
 .ELIF "$(OS)"=="AIX"
+.IF "$(AWK)"==""
 AWK*=/opt/freeware/bin/awk
+.ENDIF
+.IF "$(GNUCOPY)"==""
 GNUCOPY*=cp
+.ENDIF
+.IF "$(GNUPATCH)"==""
 GNUPATCH*=/opt/freeware/bin/patch
-GNUTAR*=gtar
+.ENDIF
+.IF "$(GNUTAR)"==""
+GNUTAR=gtar
+.ENDIF
 DEREFERENCE=-L
 .ELSE			# "$(OS)"=="SOLARIS"
 AWK*=awk
@@ -138,8 +165,12 @@ AWK*=awk
 # as the GNU make build system requires GNUCOPY to really be a GNU copy
 # we work around that for now by not setting GNUCOPY in sdev300.ini
 # for fbsd for now, but for all other platforms it is set.
-GNUCOPY*=cp
-GNUPATCH*=patch
+.IF "$(GNUCOPY)"==""
+GNUCOPY=cp
+.ENDIF
+.IF "$(GNUCOPY)"==""
+GNUPATCH=patch
+.ENDIF
 DEREFERENCE=-L
 .ENDIF			# "$(OS)"=="SOLARIS"
 .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
@@ -162,7 +193,9 @@ MKDIR*=mkdir$E
 MKDIRHIER*=mkdir$E -p
 RMDIR*=rmdir
 XARGS*=xargs
-GNUTAR*:=tar
+.IF "$(GNUTAR)"==""
+GNUTAR:=tar
+.ENDIF
 
 RM+=$(RMFLAGS)
 ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility