diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rwxr-xr-x | set_soenv.in | 1 | ||||
| -rw-r--r-- | solenv/inc/unitools.mk | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index c60b08eb3b2d..7634c5b65246 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -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@" diff --git a/set_soenv.in b/set_soenv.in index 6bb81f7b0be5..464727ddc5cd 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -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" ); diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index c07e5c36f6cc..3f8fc9e23d27 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -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 |