diff options
| -rw-r--r-- | bin/odfvalidator.sh.in | 2 | ||||
| -rw-r--r-- | bin/officeotron.sh.in | 2 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/bin/odfvalidator.sh.in b/bin/odfvalidator.sh.in index 605e74731f20..99b2207ad138 100644 --- a/bin/odfvalidator.sh.in +++ b/bin/odfvalidator.sh.in @@ -1,2 +1,2 @@ #!/usr/bin/env bash -java -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar @TARFILE_LOCATION@/@ODFVALIDATOR_JAR@ "$@" +java -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl -jar @TARFILE_LOCATION_NATIVE@/@ODFVALIDATOR_JAR@ "$@" diff --git a/bin/officeotron.sh.in b/bin/officeotron.sh.in index 7281f1bcd17c..935ec5809cdd 100644 --- a/bin/officeotron.sh.in +++ b/bin/officeotron.sh.in @@ -1,2 +1,2 @@ #!/usr/bin/env bash -java -jar @TARFILE_LOCATION@/@OFFICEOTRON_JAR@ "$@" +java -jar @TARFILE_LOCATION_NATIVE@/@OFFICEOTRON_JAR@ "$@" diff --git a/configure.ac b/configure.ac index 6c2cd76b904a..4263116f894b 100644 --- a/configure.ac +++ b/configure.ac @@ -6299,7 +6299,10 @@ else PathFormat "${absolute_path}" TARFILE_LOCATION="${formatted_path_unix}" fi +PathFormat "$TARFILE_LOCATION" +TARFILE_LOCATION_NATIVE="$formatted_path" AC_SUBST(TARFILE_LOCATION) +AC_SUBST(TARFILE_LOCATION_NATIVE) AC_MSG_CHECKING([whether we want to fetch tarballs]) if test "$enable_fetch_external" != "no"; then |