[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in sysui/desktop

[Don Lewis]

 set_soenv.in                     |   12 ++++--------
 sysui/desktop/debian/makefile.mk |    2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit eee1fb3486915a9182b5f24f9dd9c0fe8a8b959e
Author: Don Lewis <truckman at apache.org>
Date:   Mon Jan 8 08:56:31 2018 +0000

    Don't put "." in $PATH because it is somewhat inefficient
    
    as well as hazardous, especially if a user does a manual build
    and then continues to use the same shell session.
    
    Fix on instance of a script in the current directory being
    executed without a leading "./".
    
    Remember to run "./bootstrap" as configure recommends.  With
    this change "bootstrap" without the leading "./" will no longer
    work.

diff --git a/set_soenv.in b/set_soenv.in
index a68924f65467..16d37ae9de8f 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1118,8 +1118,7 @@ if ($platform =~ m/cygwin|os2/)
      
 # The general environment path.
 if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
-{  $PATH              = $cur_dir.
-                        $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
+{  $PATH              = '$SOLARENV'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$BIN;
 
    if ($platform =~ m/solaris/) {
@@ -1149,8 +1148,7 @@ elsif ($platform =~ m/cygwin/)
 
    my ( $tmppath );
 
-   $PATH              = $cur_dir.
-                        $ps.CygFormat($SOLARENV).$ds."bin".
+   $PATH              = CygFormat($SOLARENV).$ds."bin".
                         $ps.CygFormat($SOLARENV).$ds.$INPATH.$BIN;
 
    if ( $JAVA_HOME ne "" )
@@ -1283,8 +1281,7 @@ elsif ($platform =~ m/os2/)
 {  # The PATH variable is completely created from scratch. Everything that is not
    # needed is appended to the end.
 
-   $PATH              = $cur_dir.
-                        $ps.'$SOLARENV'.$ds."bin".
+   $PATH              = '$SOLARENV'.$ds."bin".
                         $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN;
 
    if ( $JAVA_HOME ne "" )
@@ -1315,8 +1312,7 @@ elsif ($platform =~ m/os2/)
 }
 
 elsif ($platform =~ m/darwin/)
-{  $PATH              = $cur_dir.
-                        $ps.'$SOLARENV'.$ds.'$INPATH'.$BIN.
+{  $PATH              = '$SOLARENV'.$ds.'$INPATH'.$BIN.
                         $ps.'$SOLARENV'.$BIN;
 
   # Append old PATH
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index 96c630a9585a..06d6d7a477c4 100644
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -57,7 +57,7 @@ ALLTAR : $(DEBFILES)
 %/DEBIAN/control : $$(@:f)
     @$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
     ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//)) $*$/etc$/
-    /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.2//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
+    /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/4.2//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr ./create_tree.sh"
         @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.2//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/4.2//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/4.2//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/4.2//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/4.2//)
     echo "Package: $(*:f:s/_/ /:1:s/4.2//)" > $@
     cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/4.2//))/" >> $@