diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2008-03-10 07:21:10 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2008-03-10 07:21:10 +0000 |
| commit | c05c9a41859b0b55989bcda066ecd5bfd2f688c6 (patch) | |
| tree | 259ecd0d418c820a01061e31b3eab9a3b85f682d /src/bind/javabind.cpp | |
| parent | add INKSCAPE_JAVADIR (diff) | |
| download | inkscape-c05c9a41859b0b55989bcda066ecd5bfd2f688c6.tar.gz inkscape-c05c9a41859b0b55989bcda066ecd5bfd2f688c6.zip | |
Changed to use INKSCAPE_JAVADIR
(bzr r5031)
Diffstat (limited to 'src/bind/javabind.cpp')
| -rw-r--r-- | src/bind/javabind.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp index a25be353e..2710efcda 100644 --- a/src/bind/javabind.cpp +++ b/src/bind/javabind.cpp @@ -22,6 +22,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include <stdio.h> #include <stdlib.h> @@ -42,6 +45,7 @@ #include "javabind.h" #include "javabind-private.h" +#include <path-prefix.h> #include <prefix.h> #include <glib/gmessages.h> @@ -289,7 +293,8 @@ static void getJavaRoot(String &javaroot) if (slashPos) *slashPos = '\0'; javaroot = exeName; - javaroot.append("\\share\\java"); + javaroot.append("\\"); + javaroot.append(INKSCAPE_JAVADIR); } @@ -425,7 +430,7 @@ static CreateVMFunc getCreateVMFunc() static void getJavaRoot(String &javaroot) { - javaroot = BR_DATADIR("/java"); + javaroot = INKSCAPE_JAVADIR; } #endif |
