strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrate XSLTPROC out of set_soenv.in

Browse source
This commit is contained in:
Norbert Thiebaud 2011-12-31 22:13:14 -06:00
parent 804a696560
commit 004df8153c
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config_host.mk.in
View file

@ -212,5 +212,6 @@ export WPG_CFLAGS="@WPG_CFLAGS@"
export WPG_LIBS="@WPG_LIBS@"
export WPS_CFLAGS="@WPS_CFLAGS@"
export WPS_LIBS="@WPS_LIBS@"
export XSLTPROC="@XSLTPROC@"
export XRANDR_CFLAGS="@XRANDR_CFLAGS@"
export XRANDR_LIBS="@XRANDR_LIBS@"

1
set_soenv.in
View file

@ -1587,7 +1587,6 @@ ToFile( "LUCENE_ANALYZERS_JAR", "@LUCENE_ANALYZERS_JAR@", "e" );
ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
ToFile( "SAXON_JAR", "@SAXON_JAR@", "e" );
ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" );
ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
ToFile( "NEON_VERSION", "@NEON_VERSION@", "e" );
ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );

6
solenv/inc/unitools.mk
View file

@ -35,11 +35,13 @@ AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc
LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize_sl
GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck
.IF "$(XSLTPROC)"=""
.IF "$(SYSTEM_LIBXSLT)"!="YES"
XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc
XSLTPROC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc
.ELSE # "$(SYSTEM_LIBXSLT)"!="YES"
XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc
XSLTPROC=$(AUGMENT_LIBRARY_PATH) xsltproc
.ENDIF # "$(SYSTEM_LIBXSLT)"!="YES"
.ENDIF
ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv