You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/01/30 20:14:14 UTC
svn commit: r1237934 - in /incubator/ooo/trunk/main: set_soenv.in
solenv/inc/unitools.mk
Author: pfg
Date: Mon Jan 30 19:14:13 2012
New Revision: 1237934
URL: http://svn.apache.org/viewvc?rev=1237934&view=rev
Log:
i85469:Fix issue with old versions of gperf.
Modified:
incubator/ooo/trunk/main/set_soenv.in
incubator/ooo/trunk/main/solenv/inc/unitools.mk
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1237934&r1=1237933&r2=1237934&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Mon Jan 30 19:14:13 2012
@@ -2094,9 +2094,9 @@ if ( $platform =~ m/cygwin/ ) {
if ($platform =~ m/solaris|darwin|freebsd/)
{
ToFile( "GNUPATCH", "@GNUPATCH@", "e");
+ ToFile( "GPERF", "@GPERF@", "e");
}
ToFile( "GNUCOPY", "@GNUCP@", "e");
-ToFile( "GPERF", "@GPERF@", "e");
# OS/2 define .pl as executable for 4os2
# use - as switch char for dmake (os2/switchar.c)
if ($platform =~ m/os2/)
Modified: incubator/ooo/trunk/main/solenv/inc/unitools.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/unitools.mk?rev=1237934&r1=1237933&r2=1237934&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/unitools.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/unitools.mk Mon Jan 30 19:14:13 2012
@@ -124,6 +124,7 @@ AWK*=awk
# for fbsd for now, but for all other platforms it is set.
GNUCOPY*=cp
GNUPATCH*=patch
+GPERF*=gperf
DEREFERENCE=-L
.ENDIF # "$(OS)"=="SOLARIS"
.IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"