You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by tr...@apache.org on 2018/01/06 08:48:47 UTC

svn commit: r1820378 - /openoffice/trunk/main/set_soenv.in

Author: truckman
Date: Sat Jan  6 08:48:47 2018
New Revision: 1820378

URL: http://svn.apache.org/viewvc?rev=1820378&view=rev
Log:
Don't add X11 include directory to compiler command line if it is
/usr/include since the compiler will look there automatically.


Modified:
    openoffice/trunk/main/set_soenv.in

Modified: openoffice/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1820378&r1=1820377&r2=1820378&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Sat Jan  6 08:48:47 2018
@@ -1432,7 +1432,9 @@ if ($platform =~ m/linux/)
 	}
     #The tail, if needed
     if ($platform =~ m/linux|freebsd|netbsd/)
-    {  $SOLARINC  .= $I.$XINC;
+    {  if ($XINC ne $USR.$INCLUDE)
+       { $SOLARINC  .= $I.$XINC;
+       }
     }
     elsif ($platform =~ m/osf1/)
     {  $SOLARINC  .= $I.$XINC.